ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

derivations: Make sure build-expression->derivation' & co. pass system'.

Browse source 
* guix/derivations.scm (imported-files): Call
  `build-expression->derivation' with SYSTEM, not (%current-system).
  (build-expression->derivation): Pass SYSTEM to `imported-modules' and
  `compiled-modules'.
This commit is contained in:
Ludovic Courtès 2012-10-25 23:14:27 +02:00
parent b272c47433
commit ae39d1b233
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/derivations.scm
View file

@ -498,7 +498,7 @@ (define* (imported-files store files
(mkdir ,tail)))))) (mkdir ,tail))))))
`((symlink ,store-path ,final-path))))) `((symlink ,store-path ,final-path)))))
files)))) files))))
(build-expression->derivation store name (%current-system) (build-expression->derivation store name system
builder files builder files
#:guile-for-build guile))) #:guile-for-build guile)))
@ -641,11 +641,15 @@ (define %build-inputs
(_ `(,exp)))))) (_ `(,exp))))))
(map second inputs))) (map second inputs)))
(mod-drv (and (pair? modules) (mod-drv (and (pair? modules)
(imported-modules store modules #:guile guile-drv))) (imported-modules store modules
#:guile guile-drv
#:system system)))
(mod-dir (and mod-drv (mod-dir (and mod-drv
(derivation-path->output-path mod-drv))) (derivation-path->output-path mod-drv)))
(go-drv (and (pair? modules) (go-drv (and (pair? modules)
(compiled-modules store modules #:guile guile-drv))) (compiled-modules store modules
#:guile guile-drv
#:system system)))
(go-dir (and go-drv (go-dir (and go-drv
(derivation-path->output-path go-drv)))) (derivation-path->output-path go-drv))))
(derivation store name system guile (derivation store name system guile