diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-12-04 16:07:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-12-04 16:07:53 +0100 |
| commit | dd1a5a152c679ba2d386dc66127a0de924182e26 (patch) | |
| tree | db197f2ae1f1655c87a93f3313b9185aa8d36d32 /guix/build-system/cmake.scm | |
| parent | 7b63fa8d155310e4e66cdb2914e01557fb36f272 (diff) | |
| download | guix-patches-dd1a5a152c679ba2d386dc66127a0de924182e26.tar guix-patches-dd1a5a152c679ba2d386dc66127a0de924182e26.tar.gz | |
derivations: Use more keyword parameters for 'build-expression->derivation'.
* guix/derivations.scm (build-expression->derivation): Turn 'system' and
'inputs' into keyword parameters.
Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
guix/build-system/gnu.scm, guix/build-system/perl.scm,
guix/build-system/python.scm, guix/build-system/trivial.scm,
guix/download.scm, guix/packages.scm, guix/profiles.scm,
guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
'build-expression->derivation' and 'derivation-expression'
accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
documentation accordingly.
(The Store Monad): Likewise for 'derivation-expression'.
Diffstat (limited to 'guix/build-system/cmake.scm')
| -rw-r--r-- | guix/build-system/cmake.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 1a5f4b6ad1..8c9a32c8ab 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -104,8 +104,9 @@ provides a 'CMakeLists.txt' file as its build system." (package-derivation store guile system))))) (let ((cmake (package-derivation store cmake system))) - (build-expression->derivation store name system - builder + (build-expression->derivation store name builder + #:system system + #:inputs `(,@(if source `(("source" ,source)) '()) |