diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-08-24 10:13:24 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-20 11:11:47 +0000 |
| commit | cd4c6f9979d1ac40c2ffde2c315afc75770608dc (patch) | |
| tree | fe72e5f914d6163644608a35e85a0bfb9f31d0bb /gnu/packages/nss.scm | |
| parent | 1d3cb218531df00af48d6a38d57e5ed35df6eac3 (diff) | |
| download | guix-cd4c6f9979d1ac40c2ffde2c315afc75770608dc.tar guix-cd4c6f9979d1ac40c2ffde2c315afc75770608dc.tar.gz | |
gnu: nspr: Don't retain references to native inputs.
* gnu/packages/nss.scm
(nspr)[inputs]: Add 'perl' and 'bash-minimal' when cross-compiling.
(nspr)[arguments]{#:disallowed-references}: Add native 'perl' when
cross-compiling.
Diffstat (limited to 'gnu/packages/nss.scm')
| -rw-r--r-- | gnu/packages/nss.scm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6560aede56..381756e387 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -26,10 +26,12 @@ (define-module (gnu packages nss) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages perl) @@ -48,10 +50,24 @@ (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) (build-system gnu-build-system) + (inputs + ;; TODO(core-updates): Make these inputs unconditional. + ;; For 'compile-et.pl' and 'nspr-config'. + (if (%current-target-system) + `(("perl" ,perl) ; for 'compile-et.pl' + ("bash-minimal" ,bash-minimal)) ; for 'nspr-config' + '())) (native-inputs `(("perl" ,perl))) (arguments - `(#:tests? #f ; no check target + `(;; Prevent the 'native' perl from sneaking into the closure. + ;; XXX it would be nice to do the same for 'bash-minimal', + ;; but using 'canonical-package' causes loops. + ,@(if (%current-target-system) + `(#:disallowed-references + (,(gexp-input (this-package-native-input "perl") #:native? #t))) + '()) + #:tests? #f ; no check target #:configure-flags (list "--disable-static" "--enable-64bit" |