From a1d841433ef54d93b170f334aa718ea64d0733cc Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 9 Jun 2021 08:12:40 +0200 Subject: gnu: libmediainfo: Fix usage of libcurl and libtinyxml2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/packages/video.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/video.scm') 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 @@ (define-public libmediainfo `(("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 @@ (define-public mediainfo `(("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 -- cgit v1.2.3