mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 06:46:50 +01:00
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.
This commit is contained in:
parent
a08cdce7ed
commit
1f34bda1e2
1 changed files with 2 additions and 3 deletions
|
@ -38,8 +38,7 @@ (define-module (guix build-system gnu)
|
||||||
|
|
||||||
(define* (package-with-explicit-inputs p boot-inputs
|
(define* (package-with-explicit-inputs p boot-inputs
|
||||||
#:optional
|
#:optional
|
||||||
(loc (source-properties->location
|
(loc (current-source-location)))
|
||||||
(current-source-location))))
|
|
||||||
"Rewrite P, which is assumed to use GNU-BUILD-SYSTEM, to take BOOT-INPUTS
|
"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."
|
as explicit inputs instead of the implicit default, and return it."
|
||||||
(define rewritten-input
|
(define rewritten-input
|
||||||
|
@ -55,7 +54,7 @@ (define (filtered-inputs inputs)
|
||||||
(fold alist-delete inputs boot-input-names))
|
(fold alist-delete inputs boot-input-names))
|
||||||
|
|
||||||
(package (inherit p)
|
(package (inherit p)
|
||||||
(location loc)
|
(location (if (pair? loc) (source-properties->location loc) loc))
|
||||||
(arguments
|
(arguments
|
||||||
(let ((args (package-arguments p)))
|
(let ((args (package-arguments p)))
|
||||||
(if (procedure? args)
|
(if (procedure? args)
|
||||||
|
|
Loading…
Reference in a new issue