From 5b770480c2a9319dea16f1b1085c9d71b686c6af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Dec 2022 13:04:20 +0200 Subject: fixup gnu-make-mesboot0 (%current-system) evaluated too early --- gnu/packages/commencement.scm | 47 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9a7e818598..9d2e401acb 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -697,28 +697,28 @@ (define (compile x) (define gnu-make-mesboot0 ;; The initial make - (let ((triplet (match (%current-system) - ((or "armhf-linux" "aarch64-linux") - "arm-linux") - ((or "i686-linux" "x86_64-linux") - "i686-linux-gnu")))) - (package - (inherit gnu-make) - (name "make-mesboot0") - (version "3.80") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/make/make-" version ".tar.gz")) - (sha256 - (base32 - "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))) - (supported-systems '("armhf-linux" "aarch64-linux" - "i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs `(("tcc" ,tcc-boot0) - ,@(%boot-gash-inputs))) - (arguments + (package + (inherit gnu-make) + (name "make-mesboot0") + (version "3.80") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" version ".tar.gz")) + (sha256 + (base32 + "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))) + (supported-systems '("armhf-linux" "aarch64-linux" + "i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot0) + ,@(%boot-gash-inputs))) + (arguments + (let ((triplet (match (%current-system) + ((or "armhf-linux" "aarch64-linux") + "arm-linux") + ((or "i686-linux" "x86_64-linux") + "i686-linux-gnu")))) `(#:implicit-inputs? #f #:guile ,%bootstrap-guile #:configure-flags (list "CC=tcc" @@ -1373,7 +1373,8 @@ (define gnu-make-mesboot (base32 "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x")))) (native-inputs (%boot-mesboot0-inputs)) - (supported-systems '("i686-linux" "x86_64-linux")) + (supported-systems '("armhf-linux" "aarch64-linux" + "i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (arguments -- cgit v1.2.3