From cd4c6f9979d1ac40c2ffde2c315afc75770608dc Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Tue, 24 Aug 2021 10:13:24 +0200
Subject: 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(-)

(limited to 'gnu/packages')

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"
-- 
cgit v1.2.3