diff --git a/guix/gexp.scm b/guix/gexp.scm index 302879f..53239ac 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -523,6 +523,8 @@ The other arguments are as for 'derivation'." (cons file-name thing))) graphs)) + (define gsystem "x86_64-linux") + (mlet* %store-monad (;; The following binding forces '%current-system' and ;; '%current-target-system' to be looked up at >>= ;; time. @@ -546,13 +548,13 @@ The other arguments are as for 'derivation'." (object->string sexp))) (modules (if (pair? %modules) (imported-modules %modules - #:system system + #:system gsystem #:module-path module-path #:guile guile-for-build) (return #f))) (compiled (if (pair? %modules) (compiled-modules %modules - #:system system + #:system gsystem #:module-path module-path #:guile guile-for-build) (return #f))) @@ -587,7 +589,7 @@ The other arguments are as for 'derivation'." ,builder) #:outputs outputs #:env-vars env-vars - #:system system + #:system gsystem #:inputs `((,guile) (,builder) ,@(if modules diff --git a/guix/packages.scm b/guix/packages.scm index 3646b9b..fe23d35 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1104,7 +1104,7 @@ symbolic output name, such as \"out\". Note that this procedure calls "This monadic procedure changes the Guile currently used to run the build code of derivations to GUILE, a package object." (lambda (store) - (let ((guile (package-derivation store guile))) + (let ((guile (package-derivation store guile "x86_64-linux"))) (values (%guile-for-build guile) store)))) (define* (package-file package