summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-03-09 18:26:50 +0100
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:31 +0200
commite6d83b1607ebb54471ff9860d096e166de02a7c3 (patch)
tree406f03cfa9ac2c4b20bf13cab724a8ff391bc424
parent2e27e7093619e0e61cd029ef4cd6615a987cfaf6 (diff)
gnu: minizip: Remove phase 'remove-crypt-h.
During the update of glibc from 2.35 to 2.39, the crypt.h header has been removed from glibc's include path. Packages depending on this header from minizip have no access to it anymore. Remove this phase. * gnu/packages/compression.scm (minizip)[arguments]{phases}: Delete 'remove-crypt-h phase. Change-Id: I645f3f2e2aac821faa02dd4642071a983185cabf Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/compression.scm11
1 files changed, 1 insertions, 10 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 9dc784a8f6..09fba0deab 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -183,16 +183,7 @@ in compression.")
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source
- (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))))))
+ (lambda _ (chdir "contrib/minizip"))))))
(native-inputs
(list autoconf automake libtool))
(propagated-inputs (list zlib))