From 5d0984595c77b1b0acd84eb4684f786de5f95aff Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 12 Jul 2014 22:11:12 +0200
Subject: gexp: Resolve the default system at '>>=' time.

Partly fixes <http://bugs.gnu.org/18002>.
Reported by David Thompson <dthompson2@worcester.edu>.

* guix/gexp.scm (gexp->derivation): Change #:system to default #f.
  Use (%current-system) from within the 'mlet*'.
* tests/gexp.scm ("gexp->derivation, default system"): New test.
---
 guix/gexp.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'guix')

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 3b154d400f..7d6a882787 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -94,7 +94,7 @@ input list as a monadic value."
 
 (define* (gexp->derivation name exp
                            #:key
-                           (system (%current-system))
+                           system
                            hash hash-algo recursive?
                            (env-vars '())
                            (modules '())
@@ -114,6 +114,7 @@ The other arguments are as for 'derivation'."
   (define outputs (gexp-outputs exp))
 
   (mlet* %store-monad ((inputs   (lower-inputs (gexp-inputs exp)))
+                       (system -> (or system (%current-system)))
                        (sexp     (gexp->sexp exp))
                        (builder  (text-file (string-append name "-builder")
                                             (object->string sexp)))
-- 
cgit v1.2.3