diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 11:04:51 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 11:04:51 +0100 |
| commit | ce9383c090fff90acb3a555d0ccfe12d791fef17 (patch) | |
| tree | 7b9cce156799486b94e4f3e55b03831638e73465 /gnu/packages/gnuzilla.scm | |
| parent | 91be09de61c277d0f1b26cefcefcd0a7fae2e00d (diff) | |
| parent | fc4eb87dc45b169e3912c73bbf60cb8ce76b7c7c (diff) | |
| download | guix-ce9383c090fff90acb3a555d0ccfe12d791fef17.tar.gz | |
Merge remote-tracking branch 'master' into core-updates.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 2f15beecc7..d5d9839e1a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -964,6 +964,13 @@ from forcing GEXP-PROMISE." 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (add-after 'link-libxul-with-libraries 'fix-ffmpeg-runtime-linker + (lambda* (#:key inputs #:allow-other-keys) + ;; Arrange to load libavcodec.so by its absolute file name. + (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" + (("libavcodec\\.so") + (string-append (assoc-ref inputs "ffmpeg") "/lib/libavcodec.so"))) + #t)) (replace 'bootstrap (lambda _ (invoke "sh" "-c" "autoconf old-configure.in > old-configure") |