From 1f34bda1e2e5ff8dc221c70e67705ca89638172f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Sep 2012 23:59:23 +0200 Subject: [PATCH] build-system/gnu: Relax location handling in `package-with-explicit-inputs'. * guix/build-system/gnu.scm (package-with-explicit-inputs): Convert LOC when it is a source-property list. --- guix/build-system/gnu.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 32cb6bfae7..20f5bbacfc 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -38,8 +38,7 @@ (define* (package-with-explicit-inputs p boot-inputs #:optional - (loc (source-properties->location - (current-source-location)))) + (loc (current-source-location))) "Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take BOOT-INPUTS as explicit inputs instead of the implicit default, and return it." (define rewritten-input @@ -55,7 +54,7 @@ as explicit inputs instead of the implicit default, and return it." (fold alist-delete inputs boot-input-names)) (package (inherit p) - (location loc) + (location (if (pair? loc) (source-properties->location loc) loc)) (arguments (let ((args (package-arguments p))) (if (procedure? args)