Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

runInLinuxVM: fix createEmptyImage/preVM case #358705

Merged
merged 2 commits into from
Nov 24, 2024
+4 −1
Merged

runInLinuxVM: fix createEmptyImage/preVM case #358705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26eba25
runInLinuxVM: re-add sourcing of stdenv & .attrs.sh
Ma27 Nov 24, 2024
4e2ce1b
apptainer.tests.image-hello-cowsay: remove obsolete `rmdir "$out"`
Ma27 Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/build-support/singularity-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions pkgs/build-support/vm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down