janneke pushed a commit to branch wip-bootstrap in repository guix. commit bdea757d8ca97e9fe4f8fd3dfd568ee87274d2ca Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Thu Jul 12 08:59:01 2018 +0200
gnu: tcc-boot: Revise dependencies. * gnu/packages/mes.scm (tcc-boot): Revise dependencies. --- gnu/packages/mes.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 328b459..a39b1a5 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -506,9 +506,7 @@ standard.") (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs - `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash")) - ("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("coreutils" , %bootstrap-coreutils&co) ("mes" ,mes-boot) ("tcc" ,tcc-boot0))) (arguments @@ -516,9 +514,7 @@ standard.") #: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")) (mes (assoc-ref %build-inputs "mes")) (tcc (assoc-ref %build-inputs "tcc")) @@ -529,10 +525,8 @@ standard.") (string-append mes "/lib/mes-loader")))) ;; unpack (setenv "PATH" (string-append - bash "/bin:" - tar "/bin:" - tcc "/bin:" - xz "/bin")) + coreutils "/bin" + ":" tcc "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (mkdir-p "source") (system* "tar" "--strip=1" "-C" "source" "-xvf" source)