janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f9e167c4ec5d548db66df7aabd6b932d9a91c824
Author: Jan Nieuwenhuizen <[email protected]>
Date: Thu Jul 12 08:06:33 2018 +0200
gnu: mescc-tools-boot: Revise dependencies.
* gnu/packages/mes.scm (mescc-tools-boot): Revise dependencies.
---
gnu/packages/mes.scm | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 09579fd..bbd9ca9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -178,10 +178,7 @@ with a Knight VM that runs Forth and Lisp.")
(base32
"14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf"))))
(native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+ `(("coreutils" , %bootstrap-coreutils&co)
("mescc-tools-seed" ,%mescc-tools-seed)
("mes-source" ,(package-source mes-boot))
("mes-seed" ,%mes-seed)))
@@ -192,19 +189,15 @@ with a Knight VM that runs Forth and Lisp.")
#:builder
(begin
(use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
+ (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
(source (assoc-ref %build-inputs "source"))
(mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(mes-source (assoc-ref %build-inputs "mes-source"))
(out (assoc-ref %outputs "out"))
(out/bin (string-append out "/bin")))
- (setenv "PATH" (string-append bash "/bin:"
- "../mescc-tools-seed:"
- tar "/bin:"
- xz "/bin"))
+ (setenv "PATH" (string-append coreutils "/bin"
+ ":" "../mescc-tools-seed"))
(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
(mkdir-p "source")
(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
