diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
commit | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (patch) | |
tree | 4d5a347efb3a5476937b21cb5bdb26204aaeea0c /guix/build-system | |
parent | 4db00e42109b6f8229259859deac35499eec9004 (diff) | |
parent | f3211ef3868326e3cec5318bc799a2ff6572741b (diff) | |
download | guix-patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar guix-patches-d501fad11cfbd69245a4d5e2d632a0ab37985b55.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/make-bootstrap.scm
Diffstat (limited to 'guix/build-system')
-rw-r--r-- | guix/build-system/trivial.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm index af54f51419..85a3c697e3 100644 --- a/guix/build-system/trivial.scm +++ b/guix/build-system/trivial.scm @@ -54,7 +54,7 @@ ignored." search-paths native-search-paths) "Like `trivial-build', but in a cross-compilation context." (build-expression->derivation store name system - `(begin (define %target ,target) ,builder) + `(let ((%target ,target)) ,builder) (append native-inputs inputs) #:outputs outputs #:modules modules |