me/guix
Archived
1
0
Fork 0
Code Activity

gnu: bzip2: Use gexps.

Browse source 
* gnu/packages/compression.scm (bzip2)[arguments]: Use gexps.
This commit is contained in:
Ludovic Courtès 2023-02-28 17:07:22 +01:00
parent 2aee6bb90c
commit 36ea77f5d7
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 84 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/compression.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
@ -297,12 +297,12 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
"0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb")))) "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) (list #:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-1)) (srfi srfi-1))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'set-paths 'hide-input-bzip2 (add-after 'set-paths 'hide-input-bzip2
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((bzip2 (assoc-ref inputs "bzip2"))) (let ((bzip2 (assoc-ref inputs "bzip2")))
@ -321,7 +321,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
#t))) #t)))
(replace 'configure (replace 'configure
(lambda* (#:key target #:allow-other-keys) (lambda* (#:key target #:allow-other-keys)
(when ,(%current-target-system) (when #$(%current-target-system)
;; Cross-compilation: use the cross tools. ;; Cross-compilation: use the cross tools.
(substitute* (find-files "." "Makefile") (substitute* (find-files "." "Makefile")
(("CC=.*$") (("CC=.*$")
@ -377,13 +377,11 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
(("/bin/rm") "rm"))) (("/bin/rm") "rm")))
#t))) #t)))
#:make-flags (list (string-append "PREFIX=" #:make-flags #~(list (string-append "PREFIX="
(assoc-ref %outputs "out"))) (assoc-ref %outputs "out")))
;; Don't attempt to run the tests when cross-compiling. ;; Don't attempt to run the tests when cross-compiling.
,@(if (%current-target-system) #:tests? (not (%current-target-system))))
'(#:tests? #f)
'())))
(inputs (inputs
`(,@(if (%current-target-system) `(,@(if (%current-target-system)
`(("bash" ,bash-minimal)) `(("bash" ,bash-minimal))