From 35e657017c79a57b76f445c2645893ebac50d943 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <post@thomasdanckaert.be>
Date: Wed, 23 Aug 2017 10:03:38 +0200
Subject: gnu: id3lib: Remove bundled zlib.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mp3.scm (id3lib)[source]: Remove bundled zlib.
[inputs]: Add zlib.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/mp3.scm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnu/packages/mp3.scm')

diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 73e767faec..9330179f96 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -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
-- 
cgit v1.2.3