aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-07-20 18:22:14 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-07-22 18:23:43 +0200
commit4b7e861b59f2088b15e5fa8ed520ecbc933f590d (patch)
treed2c3558340f01e1589ba95b1cbb44a001788393b
parent81cd8bf87096b48f50e5ab0b86396bd0ea96bce2 (diff)
downloadguix-4b7e861b59f2088b15e5fa8ed520ecbc933f590d.tar
guix-4b7e861b59f2088b15e5fa8ed520ecbc933f590d.tar.gz
gnu: gst-libav: Delete bundled ffmpeg.
* gnu/packages/gstreamer.scm (gst-libav)[source](modules, snippet): New fields. [arguments]: Remove #:phases.
-rw-r--r--gnu/packages/gstreamer.scm18
1 files changed, 8 insertions, 10 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 085d2df7b9..63d18fce5c 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -386,18 +386,16 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"))))
+ "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Drop bundled ffmpeg.
+ (delete-file-recursively "gst-libs/ext/libav")
+ #t))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--with-system-libav")
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'patch-/bin/sh
- (lambda _
- (substitute* "gst-libs/ext/libav/configure"
- (("#! /bin/sh")
- (string-append "#! "(which "sh"))))
- #t)))))
+ '(#:configure-flags '("--with-system-libav")))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python)))