mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/{gnu,trivial-build}: Fix handling of #:guile argument.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2012-10-06 01:24:46 +02:00
parent 2143cf7a50
commit 81c7948d9a
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/build-system/gnu.scm
View file

@ -119,7 +119,7 @@ (define* (gnu-build store name source inputs
"bin" "sbin")) "bin" "sbin"))
(phases '%standard-phases) (phases '%standard-phases)
(system (%current-system)) (system (%current-system))
(implicit-inputs? #t) ; useful when bootstrapping (implicit-inputs? #t) ; useful when bootstrapping
(modules '((guix build gnu-build-system) (modules '((guix build gnu-build-system)
(guix build utils)))) (guix build utils))))
"Return a derivation called NAME that builds from tarball SOURCE, with "Return a derivation called NAME that builds from tarball SOURCE, with
@ -151,14 +151,14 @@ (define builder
(define guile-for-build (define guile-for-build
(match guile (match guile
((? package?)
(package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(distro packages base))) (let* ((distro (resolve-interface '(distro packages base)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))
(package-derivation store guile system))) (package-derivation store guile system)))))
((? package?)
(package-derivation store guile system))
((? derivation-path?)
guile)))
(build-expression->derivation store name system (build-expression->derivation store name system
builder builder

10
guix/build-system/trivial.scm
View file

@ -31,14 +31,14 @@ (define* (trivial-build store name source inputs
ignored." ignored."
(define guile-for-build (define guile-for-build
(match guile (match guile
((? package?)
(package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(distro packages base))) (let* ((distro (resolve-interface '(distro packages base)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))
(package-derivation store guile system))) (package-derivation store guile system)))))
((? package?)
(package-derivation store guile system))
((? derivation-path?)
guile)))
(build-expression->derivation store name system builder inputs (build-expression->derivation store name system builder inputs
#:outputs outputs #:outputs outputs