~ruther/guix-local: gnu: minizip: Remove phase 'remove-crypt-h.

e6d83b1607ebb54471ff9860d096e166de02a7c3 — Nicolas Graves 1 year, 7 months ago 2e27e70

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>

patch browse .tar.gz .zip

1 files changed, 1 insertions(+), 10 deletions(-)

M gnu/packages/compression.scm

M gnu/packages/compression.scm => gnu/packages/compression.scm +1 -10

@@ 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))