Merge: runInLinuxVM: fix createEmptyImage/preVM case (#358705)

2024-11-24 14:38:14 +01:00 · 2024-11-24 14:38:14 +01:00 · 626d3e44e5
commit 626d3e44e5
parent 5a2387f4fc 4e2ce1ba94
2 changed files with 4 additions and 1 deletions
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@ -99,7 +99,6 @@ lib.makeExtensible (final: {
            inherit memSize;
          }
          ''
-            rmdir "$out"
            mkdir workspace
            mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
            mount /dev/${vmTools.hd} workspace
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -240,6 +240,10 @@ rec {


  vmRunCommand = qemuCommand: writeText "vm-run" ''
+    if [ -f "''${NIX_ATTRS_SH_FILE-}" ]; then
+      source "$NIX_ATTRS_SH_FILE"
+    fi
+    source $stdenv/setup
    export > saved-env

    PATH=${coreutils}/bin