08/15: gnu: bison-boot0: Remove bootstrap leaks.

[Jan Nieuwenhuizen]

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

commit f9a76a79ca302e7f6e4e2c5cd58256c9bebe6db3
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Sep 9 13:46:20 2018 +0200

    gnu: bison-boot0: Remove bootstrap leaks.
    
    * gnu/packages/commencement.scm (bison-boot0): Remove bootstrap leaks.
---
 gnu/packages/commencement.scm | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 0b6d737..e35bb42 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -358,27 +358,22 @@
   ;; This Bison is needed to build MiG so we need it early in the process.
   ;; It is also needed to rebuild Bash's parser, which is modified by
   ;; its CVE patches.  Remove it when it's no longer needed.
-  (let* ((m4    (package-with-bootstrap-guile
-                 (package-with-explicit-inputs m4 (%boot0-inputs)
-                                               (current-source-location)
-                                               #:guile %bootstrap-guile)))
-         (bison (package (inherit bison)
-                  (propagated-inputs `(("m4" ,m4)))
-                  (inputs '())                    ;remove Flex...
-                  (arguments
-                   '(#:tests? #f                  ;... and thus disable tests
-
-                     ;; Zero timestamps in liby.a; this must be done
-                     ;; explicitly here because the bootstrap Binutils don't
-                     ;; do that (default is "cru".)
-                     #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D"
-                                    "V=1"))))))
-    (package
-      (inherit (package-with-bootstrap-guile
-                (package-with-explicit-inputs bison (%boot0-inputs)
-                                              (current-source-location)
-                                              #:guile %bootstrap-guile)))
-      (native-inputs `(("perl" ,perl-boot0))))))
+  (package-with-bootstrap-guile
+   (package
+     (inherit bison)
+     (propagated-inputs `(("m4" ,m4-boot0)))
+     (inputs (%boot0-inputs))           ;remove Flex...
+     (native-inputs `(("perl" ,perl-boot0)))
+     (arguments
+      `(#:guile ,%bootstrap-guile
+        #:implicit-inputs? #f
+        #:tests? #f    ;... and thus disable tests
+        ;; Zero timestamps in liby.a; this must be done
+        ;; explicitly here because the bootstrap Binutils don't
+        ;; do that (default is "cru".)
+        #:make-flags '("ARFLAGS=crD"
+                       "RANLIB=ranlib -D"
+                       "V=1"))))))
 
 (define flex-boot0
   ;; This Flex is needed to build MiG.