From b0a2adddc8d2beeb9b3d20a433954ea10be7a8c0 Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 9 Feb 2017 13:37:03 +0000 Subject: [PATCH] gnu: libextractor: Add dependencies. * gnu/packages/gnunet.scm (libextractor): Add dependencies: tidy-html, libmp4v2, libsmf, bzip2. [arguments](configure-flags): Add "--with-libtidy". * Adjust the FIXME comment section accordingly. Signed-off-by: Kei Kebreau --- gnu/packages/gnunet.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 27e1ffb4e0..f7da12ad5c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,7 +44,9 @@ #:use-module (gnu packages libunistring) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages package-management) #:use-module (gnu packages pkg-config) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) @@ -87,13 +89,11 @@ ;; The following dependencies are all optional, but should be ;; available for maximum coverage: ;; * libmagic (file) - ;; * libmp4v2 ; package it - ;; * librpm ; package it - ;; * libsmf ; package it - ;; * libtidy ; package it + ;; * librpm (rpm) ; investigate failure ;; * libgif (giflib) ; investigate failure (inputs `(("exiv2" ,exiv2) + ("bzip2" ,bzip2) ("flac" ,flac) ("ffmpeg" ,ffmpeg) ("file" ,file) ;libmagic, for the MIME plug-in @@ -106,6 +106,9 @@ ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) ("libmpeg2" ,libmpeg2) + ("libmp4v2" ,libmp4v2) + ("libsmf" ,libsmf) + ("tidy-html" ,tidy-html) ("libogg" ,libogg) ("libtiff" ,libtiff) ("libvorbis" ,libvorbis) @@ -115,7 +118,9 @@ (arguments `(#:configure-flags (list (string-append "--with-ltdl=" - (assoc-ref %build-inputs "libltdl"))) + (assoc-ref %build-inputs "libltdl")) + (string-append "--with-tidy=" + (assoc-ref %build-inputs "tidy-html"))) #:parallel-tests? #f)) (synopsis "Library to extract meta-data from media files") (description