[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: gnu: minizip: Do not install crypt.h.
From: |
guix-commits |
Subject: |
02/09: gnu: minizip: Do not install crypt.h. |
Date: |
Wed, 5 Jun 2019 17:11:21 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit c11ac62de92c54d1422b4de6d2b50c3b2c1bbc87
Author: Ludovic Courtès <address@hidden>
Date: Wed Jun 5 19:14:52 2019 +0200
gnu: minizip: Do not install crypt.h.
* gnu/packages/compression.scm (minizip)[arguments]: Add
'remove-crypt-h' phase.
---
gnu/packages/compression.scm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index ec80dc9..024025f 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 <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2013 Andreas Enge <address@hidden>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
@@ -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)
- branch master updated (c0f6eeb -> d088d5c), guix-commits, 2019/06/05
- 04/09: syscalls: 'with-file-lock' expands to a call to 'call-with-file-lock'., guix-commits, 2019/06/05
- 02/09: gnu: minizip: Do not install crypt.h.,
guix-commits <=
- 08/09: accounts: Close database before renaming it., guix-commits, 2019/06/05
- 01/09: guix package: Do not list environment variables that need to be set., guix-commits, 2019/06/05
- 03/09: syscalls: Add 'with-file-lock' macro., guix-commits, 2019/06/05
- 09/09: accounts: Call 'fdatasync' when writing databases., guix-commits, 2019/06/05
- 07/09: nar: Really lock store files., guix-commits, 2019/06/05
- 05/09: syscalls: 'with-lock-file' catches ENOSYS., guix-commits, 2019/06/05
- 06/09: activation: Lock /etc/.pwd.lock before accessing databases., guix-commits, 2019/06/05