mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 12:00:35 +02:00
Code Releases Activity

derivations: Pass the derivation of guile-for-build to `imported-files' & co.

Browse source 
* guix/derivations.scm (%guile-for-build): Initialize to #f.
  (imported-files, imported-modules, compiled-modules): Add `guile'
  keyword parameter.  Pass it down to `build-expression->derivation'.
  (build-expression->derivation)[guile-drv]: New variable.  Pass it as
  the #:guile parameter for `imported-modules' and `compiled-modules'.

* tests/derivations.scm: Set %GUILE-FOR-BUILD to the derivation of
  %BOOTSTRAP-GUILE.
This commit is contained in:
Ludovic Courtès 2012-10-25 18:03:48 +02:00
parent 4033bde841
commit b272c47433
2 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/derivations.scm
View file

@ -21,6 +21,8 @@
#:use-module (guix derivations)
#:use-module (guix store)
#:use-module (guix utils)
#:use-module ((guix packages) #:select (package-derivation))
#:use-module ((distro packages base) #:select (%bootstrap-guile))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
@ -36,6 +38,11 @@
(define %store
(false-if-exception (open-connection)))
(when %store
;; By default, use %BOOTSTRAP-GUILE for the current system.
(let ((drv (package-derivation %store %bootstrap-guile)))
(%guile-for-build drv)))
(define (directory-contents dir)
"Return an alist representing the contents of DIR."
(define prefix-len (string-length dir))