From 81c7948d9acd3e203e5fd7185dbead33c11d4a92 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 Oct 2012 01:24:46 +0200 Subject: build-system/{gnu,trivial-build}: Fix handling of #:guile argument. * guix/build-system/gnu.scm (gnu-build)[guile-for-build]: Check whether GUILE matches string? before checking whether it matches derivation-path?. * guix/build-system/trivial.scm (trivial-build)[guile-for-build]: Likewise. --- guix/build-system/trivial.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'guix/build-system/trivial.scm') diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm index 8759cb3f92..3598018749 100644 --- a/guix/build-system/trivial.scm +++ b/guix/build-system/trivial.scm @@ -31,14 +31,14 @@ ignored." (define guile-for-build (match guile + ((? package?) + (package-derivation store guile system)) + ((and (? string?) (? derivation-path?)) + guile) (#f ; the default (let* ((distro (resolve-interface '(distro packages base))) (guile (module-ref distro 'guile-final))) - (package-derivation store guile system))) - ((? package?) - (package-derivation store guile system)) - ((? derivation-path?) - guile))) + (package-derivation store guile system))))) (build-expression->derivation store name system builder inputs #:outputs outputs -- cgit v1.2.3