diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-01 12:59:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-01 12:59:31 +0100 |
| commit | ff8061b59161592690ab6ea526282fae11d87676 (patch) | |
| tree | 09f00df03ec0a1f4922376ba1a0cd4f443a305e4 /guix/build-system | |
| parent | e50805251ae7386c2ddbd036885bcc4300cf336e (diff) | |
| parent | b645425f71a5a777e7658bbdac0e22e134d44db5 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cmake.scm | 1 | ||||
| -rw-r--r-- | guix/build-system/perl.scm | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 5f5c243572..e09f165b97 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -64,7 +64,6 @@ (guix build gnu-build-system) (guix build utils))) (modules '((guix build cmake-build-system) - (guix build gnu-build-system) (guix build utils)))) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 6661689efb..5dc50d97f3 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -35,9 +35,16 @@ ;; ;; Code: +(define (default-perl) + "Return the default Perl package." + + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages perl)))) + (module-ref module 'perl))) + (define* (perl-build store name source inputs #:key - (perl (@ (gnu packages perl) perl)) + (perl (default-perl)) (search-paths '()) (tests? #t) (make-maker-flags ''()) @@ -50,7 +57,6 @@ (guix build gnu-build-system) (guix build utils))) (modules '((guix build perl-build-system) - (guix build gnu-build-system) (guix build utils)))) "Build SOURCE using PERL, and with INPUTS. This assumes that SOURCE provides a `Makefile.PL' file as its build system." |