gnu: id3lib: Remove bundled zlib.
authorThomas Danckaert <post@thomasdanckaert.be>
Wed, 23 Aug 2017 08:03:38 +0000 (10:03 +0200)
committer宋文武 <iyzsong@member.fsf.org>
Wed, 23 Aug 2017 11:58:26 +0000 (19:58 +0800)
* gnu/packages/mp3.scm (id3lib)[source]: Remove bundled zlib.
[inputs]: Add zlib.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
gnu/packages/mp3.scm

index 73e767f..9330179 100644 (file)
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -114,8 +115,12 @@ versions of ID3v2.")
             (sha256
              (base32
               "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"))
+            (modules '((guix build utils)))
+            ;; Don't use bundled zlib
+            (snippet '(delete-file-recursively "zlib"))
             (patches (search-patches "id3lib-CVE-2007-4460.patch"))))
    (build-system gnu-build-system)
+   (inputs `(("zlib" ,zlib)))
    (arguments
     `(#:phases
        (alist-cons-before