guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 0b8ce49cf4e96958266ec0cb08b7e5447541be23 Author: Nicolas Graves <[email protected]> AuthorDate: Thu Feb 19 09:31:34 2026 +0100 gnu: bzip2: Drop input labels. * gnu/packages/compression.scm (bzip2): [inputs]: Drop input labels. [arguments]<#:phases>: Adjust hide-input-bzip2 phase. * gnu/packages/commencement.scm (bzip2-boot0)[inputs]: Drop input labels. Change-Id: Ia886eb779f3f6926d1af96fda8e8ebf5ef2431bf Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 5 ++--- gnu/packages/compression.scm | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 5c8ef6ba057..d835bd770f4 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2057,9 +2057,8 @@ exec " gcc-bin "/" program (name "bzip2-boot0") (native-inputs `()) (inputs - `(("diffutils" ,diffutils-boot0) - ("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs+toolchain))) + (cons* diffutils-boot0 gnu-make-boot0 + (map cadr (%bootstrap-inputs+toolchain)))) (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 09f2c2ab4ce..bd0ff8b02df 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -396,20 +396,21 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in #~(modify-phases %standard-phases (add-after 'set-paths 'hide-input-bzip2 (lambda* (#:key inputs #:allow-other-keys) - (let ((bzip2 (assoc-ref inputs "bzip2"))) - (if bzip2 + (let ((libbz2.so (false-if-exception + (search-input-file inputs "lib/libbz2.so")))) + (if libbz2.so ;; Prevent the build system from retaining a reference to - ;; BZIP2 from INPUTS. + ;; BZIP2 from INPUTS (used in both implicit and bootstrap). (begin - (setenv "LIBRARY_PATH" - (string-join (delete (string-append bzip2 "/lib") - (string-split (getenv "LIBRARY_PATH") - #\:)) - ":")) + (let ((library-path (string-split (getenv "LIBRARY_PATH") + #\:))) + (setenv "LIBRARY_PATH" + (string-join (delete (dirname libbz2.so) + library-path) + ":"))) (format #t "environment variable `LIBRARY_PATH' set to `~a'~%" (getenv "LIBRARY_PATH"))) - (format #t "no bzip2 found, nothing done~%")) - #t))) + (format #t "no bzip2 found, nothing done~%"))))) (replace 'configure (lambda* (#:key target #:allow-other-keys) (when #$(%current-target-system) @@ -473,10 +474,9 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in ;; Don't attempt to run the tests when cross-compiling. #:tests? (not (%current-target-system)))) - (inputs - `(,@(if (%current-target-system) - `(("bash" ,bash-minimal)) - '()))) + (inputs (if (%current-target-system) + (list bash-minimal) + (list))) (outputs '("out" "static")) (synopsis "High-quality data compression program") (description
