[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: icecat: Fix linking with ffmpeg.
From: |
guix-commits |
Subject: |
01/01: gnu: icecat: Fix linking with ffmpeg. |
Date: |
Mon, 23 Dec 2019 06:48:49 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 8e5567195f5d29301d571612085b5afdb460619d
Author: Julien Lepiller <address@hidden>
Date: Thu Dec 19 13:02:07 2019 +0100
gnu: icecat: Fix linking with ffmpeg.
* gnu/packages/gnuzilla.scm (icecat)[arguments]: Add
'fix-ffmpeg-runtime-linker' phase.
Co-authored-by: Mark H Weaver <address@hidden>.
---
gnu/packages/gnuzilla.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 2f15bee..d5d9839 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")