runInLinuxVM: refactor vmRunCommand

This makes it simpler to copy more files to xchg for the structuredAttrs case in the next commit.
NixOS · Nov 30, 2024 · 58570e7 · 58570e7
1 parent 437e6db
commit 58570e7
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
@@ -230,16 +230,15 @@ rec {
 
 
   vmRunCommand = qemuCommand: writeText "vm-run" ''
-    export > saved-env
+    ${coreutils}/bin/mkdir xchg
+    export > xchg/saved-env
+    PATH=${coreutils}/bin
+
     if [ -f "''${NIX_ATTRS_SH_FILE-}" ]; then
       source "$NIX_ATTRS_SH_FILE"
     fi
     source $stdenv/setup
 
-    PATH=${coreutils}/bin
-    mkdir xchg
-    mv saved-env xchg/
-
     eval "$preVM"
 
     if [ "$enableParallelBuilding" = 1 ]; then