From ae39d1b233c93bcca0c27a64d59040e50e2a0955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 25 Oct 2012 23:14:27 +0200
Subject: [PATCH] derivations: Make sure `build-expression->derivation' & co.
pass `system'.
* guix/derivations.scm (imported-files): Call
`build-expression->derivation' with SYSTEM, not (%current-system).
(build-expression->derivation): Pass SYSTEM to `imported-modules' and
`compiled-modules'.
---
guix/derivations.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/guix/derivations.scm b/guix/derivations.scm
index 4be31688249..7fc8734238a 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -498,7 +498,7 @@ (define* (imported-files store files
(mkdir ,tail))))))
`((symlink ,store-path ,final-path)))))
files))))
- (build-expression->derivation store name (%current-system)
+ (build-expression->derivation store name system
builder files
#:guile-for-build guile)))
@@ -641,11 +641,15 @@ (define %build-inputs
(_ `(,exp))))))
(map second inputs)))
(mod-drv (and (pair? modules)
- (imported-modules store modules #:guile guile-drv)))
+ (imported-modules store modules
+ #:guile guile-drv
+ #:system system)))
(mod-dir (and mod-drv
(derivation-path->output-path mod-drv)))
(go-drv (and (pair? modules)
- (compiled-modules store modules #:guile guile-drv)))
+ (compiled-modules store modules
+ #:guile guile-drv
+ #:system system)))
(go-dir (and go-drv
(derivation-path->output-path go-drv))))
(derivation store name system guile
--
GitLab