diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:35:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:35:17 +0200 |
| commit | 5608847c6f4131e8f30321fdf25289efd73f8689 (patch) | |
| tree | 5a5910165d29455b249fd4d6612078ff5cf6ced5 /guix/build-system/cmake.scm | |
| parent | 0c456db45bf03df61cdb71db7742a44f4328fb3d (diff) | |
| parent | f59e9eaac87b4365c646a475d44b431e43949649 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system/cmake.scm')
| -rw-r--r-- | guix/build-system/cmake.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 76a9a3befe..9461b19a2e 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -72,9 +72,9 @@ provides a 'CMakeLists.txt' file as its build system." (define builder `(begin (use-modules ,@modules) - (cmake-build #:source ,(if (and source (derivation-path? source)) - (derivation-path->output-path source) - source) + (cmake-build #:source ,(if (derivation? source) + (derivation->output-path source) + source) #:system ,system #:outputs %outputs #:inputs %build-inputs |