From b421cebd6adbbadf6ad9aa000ca6605b1a4b2380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Oct 2013 22:28:15 +0200 Subject: build-system/perl: Lazily resolve (gnu packages perl). * guix/build-system/perl.scm (default-perl): New procedure. (perl-build): Use it. --- guix/build-system/perl.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'guix/build-system') diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 6661689efb..eac8f53d3e 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 ''()) -- cgit v1.2.3 From 758704102848fb930f4ebba5945784cd8a64668d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 28 Oct 2013 22:54:27 +0100 Subject: build-system/{cmake,perl}: Don't use (guix build gnu-build-system). Previously references to '%standard-phases' in builder-side code would refer to the wrong one. * guix/build-system/cmake.scm (cmake-build): Remove (guix build gnu-build-system) from the default MODULES value. * guix/build-system/perl.scm (perl-build): Likewise. --- guix/build-system/cmake.scm | 1 - guix/build-system/perl.scm | 1 - 2 files changed, 2 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 9461b19a2e..38f11cb3c3 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -65,7 +65,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 eac8f53d3e..5dc50d97f3 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -57,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." -- cgit v1.2.3