diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
| commit | d9bbfe042e06df35c12e4b8f53bfb1889cba90bf (patch) | |
| tree | 9f34077cd824e8955be4ed2b5f1a459aa8076489 /gnu/packages/compression.scm | |
| parent | f87a7cc60e058d2e07560d0d602747b567d9dce4 (diff) | |
| parent | 47f2168b6fabb105565526b2a1243eeeb13008fe (diff) | |
| download | guix-d9bbfe042e06df35c12e4b8f53bfb1889cba90bf.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8db1136be0..2b18629cca 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> @@ -128,7 +128,16 @@ in compression.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source - (lambda _ (chdir "contrib/minizip") #t))))) + (lambda _ (chdir "contrib/minizip") #t)) + (add-after 'install 'remove-crypt-h + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove <minizip/crypt.h> because it interferes with libc's + ;; <crypt.h> given that 'minizip.pc' says "-I…/include/minizip". + ;; Fedora does the same: + ;; <https://src.fedoraproject.org/rpms/zlib/c/4d2785ec3116947872f6f32dc4104e6d36d8a7a4?branch=master>. + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/include/minizip/crypt.h")) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) |