janneke pushed a commit to branch wip-bootstrap in repository guix. commit 56a6a44391cab5204b3853550ea5f5e589264c19 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Thu Jul 12 08:54:00 2018 +0200
gnu: tcc-boot0: Revise dependencies. * gnu/packages/mes.scm (tcc-boot0): Revise dependencies. --- gnu/packages/mes.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 59f4e5a..21a3ca9 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -381,9 +381,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (build-system trivial-build-system) (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) ("mes-seed" ,%mes-seed) ("mescc-tools" ,mescc-tools-boot) @@ -398,13 +396,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") #:builder (begin (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "static-bash")) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) (mes (assoc-ref %build-inputs "mes")) (guile (assoc-ref %build-inputs "guile")) (srfi-43 (assoc-ref %build-inputs "srfi-43")) (mescc-tools (assoc-ref %build-inputs "mescc-tools")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) (source (assoc-ref %build-inputs "source")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) (mes-seed (assoc-ref %build-inputs "mes-seed")) @@ -417,13 +413,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") (dir (getcwd))) ;; unpack (setenv "PATH" (string-append - bash "/bin:" - mes "/bin:" - (if guile (string-append guile "/bin:") + coreutils "/bin" + ":" mes "/bin" + (if guile (string-append ":" guile "/bin") "") - mescc-tools "/bin:" - tar "/bin:" - xz "/bin")) + ":" mescc-tools "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (mkdir-p "source") (system* "tar" "--strip=1" "-C" "source" "-xvf" source)