diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-10-25 15:35:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-10-25 15:38:14 +0200 |
| commit | 8f349a3bf3cc9a2a4733a25d66cd06309bb4d586 (patch) | |
| tree | 7d2772af5f333ecc0c5f826f0ea3700394ac8737 /nixos/modules/virtualisation | |
| parent | 5939af52b32c01edca7ad4c363b627970db3e04e (diff) | |
| download | nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.tar nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.tar.gz nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.tar.bz2 nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.tar.lz nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.tar.xz nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.tar.zst nixlib-8f349a3bf3cc9a2a4733a25d66cd06309bb4d586.zip | |
Add function closureInfo to replace pathsFromGraph
Unlike pathsFromGraph, on Nix 1.12, this function produces a registration file containing correct NAR hash/size information. https://hydra.nixos.org/build/62832723
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a17e2c9ca471..3c89ca68113b 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -92,7 +92,7 @@ let -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ - -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ + -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ ''} \ $extraDisks \ ${qemuGraphics} \ @@ -102,15 +102,7 @@ let ''; - regInfo = pkgs.runCommand "reginfo" - { exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB; - buildInputs = [ pkgs.perl ]; - preferLocalBuild = true; - } - '' - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out - ''; + regInfo = pkgs.closureInfo { rootPaths = config.virtualisation.pathsInNixDB; }; # Generate a hard disk image containing a /boot partition and GRUB |