06/15: gnu: perl-boot0: Remove bootstrap leaks.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 5210a03f8678160980c607259d9bc96b6c4fc189
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Sep 9 13:42:22 2018 +0200

    gnu: perl-boot0: Remove bootstrap leaks.
    
    * gnu/packages/commencement.scm (perl-boot0): Remove bootstrap leaks.
---
 gnu/packages/commencement.scm | 55 ++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c8108f6..dbb9620 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -314,33 +314,34 @@
      (native-inputs `()))))
 
 (define perl-boot0
-  (let ((perl (package
-                (inherit perl)
-                (name "perl-boot0")
-                (arguments
-                 ;; At the very least, this must not depend on GCC & co.
-                 (let ((args `(#:disallowed-references
-                               ,(list %bootstrap-binutils))))
-                   (substitute-keyword-arguments (package-arguments perl)
-                     ((#:phases phases)
-                      `(modify-phases ,phases
-                         ;; Pthread support is missing in the bootstrap 
compiler
-                         ;; (broken spec file), so disable it.
-                         (add-before 'configure 'disable-pthreads
-                           (lambda _
-                             (substitute* "Configure"
-                               (("^libswanted=(.*)pthread" _ before)
-                                (string-append "libswanted=" before)))
-                             #t))))
-                     ;; Do not configure with '-Dusethreads' since pthread
-                     ;; support is missing.
-                     ((#:configure-flags configure-flags)
-                      `(delete "-Dusethreads" ,configure-flags))))))))
-    (package-with-bootstrap-guile
-     (package-with-explicit-inputs perl
-                                   (%boot0-inputs)
-                                   (current-source-location)
-                                   #:guile %bootstrap-guile))))
+  (package-with-bootstrap-guile
+   (package
+     (inherit perl)
+     (name "perl-boot0")
+     (arguments
+      `(#:guile ,%bootstrap-guile
+        #:implicit-inputs? #f
+        ;; At the very least, this must not depend on GCC & co.
+        #:disallowed-references
+        ,(list %bootstrap-binutils)
+        ,@(substitute-keyword-arguments (package-arguments perl)
+            ((#:phases phases)
+             `(modify-phases ,phases
+                ;; Pthread support is missing in the bootstrap compiler
+                ;; (broken spec file), so disable it.
+                (add-before 'configure 'disable-pthreads
+                  (lambda _
+                    (substitute* "Configure"
+                      (("^libswanted=(.*)pthread" _ before)
+                       (string-append "libswanted=" before)))
+                    #t))))
+            ;; Do not configure with '-Dusethreads' since pthread
+            ;; support is missing.
+            ((#:configure-flags configure-flags)
+             `(delete "-Dusethreads" ,configure-flags)))))
+     (inputs (%boot0-inputs))
+     (propagated-inputs '())
+     (native-inputs '()))))
 
 (define bison-boot0
   ;; This Bison is needed to build MiG so we need it early in the process.