Unverified Commit 58570e75 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

runInLinuxVM: refactor vmRunCommand

This makes it simpler to copy more files to xchg for the structuredAttrs
case in the next commit.
parent 437e6dbb
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -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