diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-09-05 23:59:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-09-05 23:59:23 +0200 |
| commit | 1f34bda1e2e5ff8dc221c70e67705ca89638172f (patch) | |
| tree | fdbe3763e441d39531a85b568c0934beab7ce119 | |
| parent | a08cdce7edc84bb68b0ff699c4d13479247abed8 (diff) | |
| download | guix-1f34bda1e2e5ff8dc221c70e67705ca89638172f.tar.gz | |
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.
| -rw-r--r-- | guix/build-system/gnu.scm | 5 |
1 files 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) |