diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-05 00:01:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-05 00:08:04 +0100 |
| commit | 9ec154f51f52ee3702c611637e96ccb0d59f543a (patch) | |
| tree | 1502bb6f0efa6f34c32c6bb62c4431bcf89c1b32 /guix | |
| parent | e4be1faa43eb9897e62eefd234ab3a98f324e898 (diff) | |
| download | gnu-guix-9ec154f51f52ee3702c611637e96ccb0d59f543a.tar gnu-guix-9ec154f51f52ee3702c611637e96ccb0d59f543a.tar.gz | |
gexp: Lowering a <computed-file> honors SYSTEM and TARGET.
* guix/gexp.scm (computed-file-compiler): Pass #:system and #:target to
'gexp->derivation'.
* tests/gexp.scm ("lower-object, computed-file, #:system"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/gexp.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index 88cabc8ed5..febd72a904 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org> ;;; @@ -388,8 +388,9 @@ This is the declarative counterpart of 'gexp->derivation'." (mlet %store-monad ((guile (lower-object guile system #:target target))) (apply gexp->derivation name gexp #:guile-for-build guile - options)) - (apply gexp->derivation name gexp options))))) + #:system system #:target target options)) + (apply gexp->derivation name gexp + #:system system #:target target options))))) (define-record-type <program-file> (%program-file name gexp guile path) |