guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.

commit e3b5b6425d2b9f3d43cab960d249662b74ee6fcb
Author: Nicolas Graves <ngra...@ngraves.fr>
AuthorDate: Sun Mar 9 18:26:50 2025 +0100

    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 <l...@gnu.org>
---
 gnu/packages/compression.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index ee3150bc4d..80e18552e7 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))

Reply via email to