[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/52: gnu: nspr: Don't retain references to native inputs.
From: |
guix-commits |
Subject: |
07/52: gnu: nspr: Don't retain references to native inputs. |
Date: |
Mon, 20 Sep 2021 07:19:28 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit cd4c6f9979d1ac40c2ffde2c315afc75770608dc
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 10:13:24 2021 +0200
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.
---
gnu/packages/nss.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 6560aed..381756e 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"
- branch core-updates-frozen updated (4bacf9c -> aacaa22), guix-commits, 2021/09/20
- 02/52: gnu: elogind: Make #:configure-flags a G-exp., guix-commits, 2021/09/20
- 01/52: gnu: dbus-glib: Support cross-compilation., guix-commits, 2021/09/20
- 07/52: gnu: nspr: Don't retain references to native inputs.,
guix-commits <=
- 11/52: build-system/glib-or-gtk: Support cross-compilaton., guix-commits, 2021/09/20
- 23/52: gnu: heimdal: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 24/52: gnu: heimdal: Fix linking error when cross-compiling., guix-commits, 2021/09/20
- 12/52: gnu: dbus-cairo: Add missing bash-minimal input., guix-commits, 2021/09/20
- 18/52: gnu: bdb: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions., guix-commits, 2021/09/20
- 13/52: gnu: polkit: Prevent cross-compilation build error., guix-commits, 2021/09/20
- 17/52: gnu: atk: Disable introspection when cross-compiling., guix-commits, 2021/09/20
- 16/52: gobject-introspection: Correct library name when cross-compiling., guix-commits, 2021/09/20
- 34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., guix-commits, 2021/09/20