talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

runInLinuxVM: fix simple build

Browse Source 
In 58570e75d9bddede2a854b0f7cb8df7f1818c541, I moved the PATH for
coreutils *before* the sourcing of attrs + stdenv. However, AFAICT, this
leads to PATH being overwritten and cat+chmod can't be found later on.

We don't need to set PATH here at all, we can just do the same thing as
in stage2Init - reference every coreutil explicitly. This keeps the
environment the cleanest.

Resolves #378545
This commit is contained in:
Wolfgang Walther 2025-02-01 17:58:43 +01:00
parent 7408cd8c4a
commit a6dbc4b689
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/vm/default.nix
View File

@ -237,10 +237,9 @@ rec {
vmRunCommand = qemuCommand: writeText "vm-run" ''
${coreutils}/bin/mkdir xchg
export > xchg/saved-env
PATH=${coreutils}/bin
if [ -f "''${NIX_ATTRS_SH_FILE-}" ]; then
cp $NIX_ATTRS_JSON_FILE $NIX_ATTRS_SH_FILE xchg
${coreutils}/bin/cp $NIX_ATTRS_JSON_FILE $NIX_ATTRS_SH_FILE xchg
source "$NIX_ATTRS_SH_FILE"
fi
source $stdenv/setup
@ -258,7 +257,7 @@ rec {
# Write the command to start the VM to a file so that the user can
# debug inside the VM if the build fails (when Nix is called with
# the -K option to preserve the temporary build directory).
cat > ./run-vm <<EOF
${coreutils}/bin/cat > ./run-vm <<EOF
#! ${bash}/bin/sh
''${diskImage:+diskImage=$diskImage}
# GitHub Actions runners seems to not allow installing seccomp filter: https://github.com/rcambrj/nix-pi-loader/issues/1#issuecomment-2605497516
@ -268,7 +267,7 @@ rec {
${qemuCommand}
EOF
chmod +x ./run-vm
${coreutils}/bin/chmod +x ./run-vm
source ./run-vm
if ! test -e xchg/in-vm-exit; then
@ -276,7 +275,7 @@ rec {
exit 1
fi
exitCode="$(cat xchg/in-vm-exit)"
exitCode="$(${coreutils}/bin/cat xchg/in-vm-exit)"
if [ "$exitCode" != "0" ]; then
exit "$exitCode"
fi