diff options
| author | Michael Rohleder <mike@rohleder.de> | 2021-06-09 08:12:40 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-06-12 00:49:32 +0200 |
| commit | a1d841433ef54d93b170f334aa718ea64d0733cc (patch) | |
| tree | 5f0bf448beb5cc28367e3b03ae3c8a5dab327f85 | |
| parent | 8cef92d0633850d97c1a1d4521812268f56672be (diff) | |
| download | guix-a1d841433ef54d93b170f334aa718ea64d0733cc.tar guix-a1d841433ef54d93b170f334aa718ea64d0733cc.tar.gz | |
gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.
* gnu/packages/video.scm (libmediainfo): Fix usage of libcurl and libtinyxml2.
[arguments]: Add configure-flags.
[native-inputs]: Move zlib, tinyxml2, curl, libzen to ...
[propagated-inputs]: ... Here.
(mediainfo):
[native-inputs]: Remove zlib, libzen. Move libmediainfo to ...
[inputs]: ... Here.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/video.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a694d4bb43..5c028016cf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3850,14 +3850,17 @@ practically any type of media.") `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("zlib" ,zlib) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("zlib" ,zlib) ("tinyxml2" ,tinyxml2) - ("curl" ,curl) + ("curl" ,curl) ; In Requires.private of libmediainfo.pc. ("libzen" ,libzen))) (build-system gnu-build-system) (arguments '(#:tests? #f ; see above TODO + #:configure-flags + (list "--with-libcurl" "--with-libtinyxml2") #:phases ;; build scripts not in root of archive (modify-phases %standard-phases @@ -3910,10 +3913,9 @@ MPEG-2, MPEG-4, DVD (VOB)... `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("zlib" ,zlib) - ("libmediainfo" ,libmediainfo) - ("libzen" ,libzen))) + ("pkg-config" ,pkg-config))) + (inputs + `(("libmediainfo" ,libmediainfo))) (build-system gnu-build-system) (arguments '(#:tests? #f ; lacks tests |