diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-05-19 09:23:01 +0200 |
|---|---|---|
| committer | Guix Patches Tester <> | 2020-05-24 21:34:16 +0100 |
| commit | 5025d08fa7aac2e9d9522f28bd89ee50ee78c6ab (patch) | |
| tree | fe7747d1e48b38a39a884b8999e5a1f451237276 /gnu/system/vm.scm | |
| parent | 047a76eb0892f2f7f7c96bb7aae9e72bea47c5af (diff) | |
| download | patches-5025d08fa7aac2e9d9522f28bd89ee50ee78c6ab.tar patches-5025d08fa7aac2e9d9522f28bd89ee50ee78c6ab.tar.gz | |
system: vm: Do not register-closures when cross-building to the Hurd.series-4026
This supports cross-building building a vm-image for the Hurd, running a
native qemu.
* gnu/system/vm.scm (qemu-image)[register-closures?]: Default to #f when
cross-compiling to the Hurd. Only create sql-schema when actually registering
closures.
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3e483fd86c..b343141c18 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages zile) #:use-module (gnu packages linux) #:use-module (gnu packages admin) + #:use-module (gnu packages hurd) #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) @@ -286,7 +287,8 @@ substitutable." os bootcfg-drv bootloader - (register-closures? (has-guix-service-type? os)) + (register-closures? (and (has-guix-service-type? os) + (not (hurd-target?)))) (inputs '()) copy-inputs? (substitutable? #t)) @@ -333,12 +335,13 @@ system that is passed to 'populate-root-file-system'." ((gnu build linux-boot) #:select (make-essential-device-nodes make-hurd-device-nodes)) - (guix store database) (guix build utils) (srfi srfi-26) (ice-9 binary-ports)) - (sql-schema #$schema) + (when #$register-closures? + (use-modules (guix store database)) + (sql-schema #$schema)) ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. (setenv "GUIX_LOCPATH" |