04/05: gnu: file-boot0: Remove bootstrap leaks.

[Jan Nieuwenhuizen]

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

commit cf5b1af32769c1d27b83d566c4d8de2ab11ad1a5
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Sep 6 21:35:25 2018 +0200

    gnu: file-boot0: Remove bootstrap leaks.
    
    * gnu/packages/commencement.scm (file-boot0): Remove bootstrap leaks.
---
 gnu/packages/commencement.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b4778c6..acbe090 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1669,22 +1669,24 @@ exec " gcc "/bin/" program
 
 (define file-boot0
   (package-with-bootstrap-guile
-   (let ((p (package-with-explicit-inputs file
-                                          `(("make" ,gnu-make-boot0)
-                                            ,@(%bootstrap-inputs+toolchain))
-                                          #:guile %bootstrap-guile)))
-     (package
-       (inherit p)
-       (name "file-boot0")
-       (arguments `(#:strip-binaries?
-                    ,(match (%current-system)
+   (package
+     (inherit file)
+     (name "file-boot0")
+     (inputs `(("make" ,gnu-make-boot0)
+               ,@(%bootstrap-inputs+toolchain)))
+     (propagated-inputs '())
+     (native-inputs '())
+     (arguments `(#:guile ,%bootstrap-guile
+                  #:implicit-inputs? #f
+                  #:strip-binaries?
+                  ,(match (%current-system)
                                         ;strip: supported targets: elf32-i386 
a.out-i386-linux pei-i386
                                         ;elf32-little elf32-big srec 
symbolsrec verilog tekhex binary ihex
                                         ;trad-core
-                       ("i686-linux" #f)
-                       (_ #t))          ; attempt to change nothing
-                    #:validate-runpath?
-                    ,(match (%current-system)
+                     ("i686-linux" #f)
+                     (_ #t))            ; attempt to change nothing
+                  #:validate-runpath?
+                  ,(match (%current-system)
                                         ; validating RUNPATH of 1
                                         ; binaries in
                                         ; 
"/gnu/store/j6qq0pzwx9abpjpd0xly5fp0gkqlx0k4-file-boot0-5.32/bin"...
@@ -1693,10 +1695,9 @@ exec " gcc "/bin/" program
                                         ; 'libmagic.so.1', which
                                         ; cannot be found in RUNPATH
                                         ; ()
-                       ("i686-linux" #f)
-                       (_ #t))
-                    ,@(package-arguments p)))))))
-
+                     ("i686-linux" #f)
+                     (_ #t))
+                  ,@(package-arguments file))))))
 
 (define (%boot0-inputs)
   `(("make" ,gnu-make-boot0)