09/15: gnu: texinfo-boot0: Remove bootstrap leaks.

[Jan Nieuwenhuizen]

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

commit 8d9c16ed3b792d027dd4842aad718d71e82894d7
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Sep 9 15:13:21 2018 +0200

    gnu: texinfo-boot0: Remove bootstrap leaks.
    
    * gnu/packages/commencement.scm (texinfo-boot0): Remove bootstrap leaks.
---
 gnu/packages/commencement.scm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index e35bb42..75577c1 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -466,18 +466,17 @@ the bootstrap environment."
   ;; We build without ncurses because it fails to build at this stage, and
   ;; because we don't need the stand-alone Info reader.
   ;; Also, use (%BOOT0-INPUTS) to avoid building Perl once more.
-  (let ((texinfo (package (inherit texinfo)
-                   (native-inputs '())
-                   (inputs `(("perl" ,perl-boot0)))
-
-                   ;; Some of Texinfo 6.1's tests would fail with "Couldn't
-                   ;; set UTF-8 character type in locale" but we don't have a
-                   ;; UTF-8 locale at this stage, so skip them.
-                   (arguments '(#:tests? #f)))))
-    (package-with-bootstrap-guile
-     (package-with-explicit-inputs texinfo (%boot0-inputs)
-                                   (current-source-location)
-                                   #:guile %bootstrap-guile))))
+  (package (inherit texinfo)
+           (native-inputs '())
+           (inputs `(("perl" ,perl-boot0)
+                     ,@(%boot0-inputs)))
+
+           ;; Some of Texinfo 6.1's tests would fail with "Couldn't
+           ;; set UTF-8 character type in locale" but we don't have a
+           ;; UTF-8 locale at this stage, so skip them.
+           (arguments `(#:implicit-inputs? #f
+                        #:guile ,%bootstrap-guile
+                        #:tests? #f))))
 
 (define ld-wrapper-boot0
   ;; We need this so binaries on Hurd will have libmachuser and libhurduser