From 0a2873e5158fb93d8cc31d91a7025801179bf1cd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 3 Sep 2013 10:18:38 +0200 Subject: build-system/gnu: Delay resolution of (@ (gnu packages cmake) cmake). * guix/build-system/cmake.scm (default-cmake): New procedure. (cmake-build): Use it. --- guix/build-system/cmake.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'guix/build-system/cmake.scm') diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 3347dc502c..76eb9bf945 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -35,13 +35,20 @@ (define-module (guix build-system cmake) ;; ;; Code: +(define (default-cmake) + "Return the default CMake package." + + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages cmake)))) + (module-ref module cmake))) + (define* (cmake-build store name source inputs #:key (guile #f) (outputs '("out")) (configure-flags ''()) (search-paths '()) (make-flags ''()) (patches ''()) (patch-flags ''("--batch" "-p1")) - (cmake (@ (gnu packages cmake) cmake)) + (cmake (default-cmake)) (out-of-source? #f) (tests? #t) (test-target "test") -- cgit v1.2.3