Skip to content

Commit

Permalink
disk-image: Fix compatibility with nixpkgs unstable
Browse files Browse the repository at this point in the history
Fixes #900

This was caused by NixOS/nixpkgs#354535
originally. The breaking changes introduced there have been resolved by
NixOS/nixpkgs#360413, but one addition survived,
which was the line `source $stdenv/setup`.

Because we used `>` instead of `>>`, `saved-env` was overwritten, so
even with the second PR, the script failed with the following error:

    /nix/store/pw...ykc-vm-run-stage2: line 16: stdenv: unbound variable

Once this and the second PR mentioned above are merged, #903 will be
unblocked.
  • Loading branch information
iFreilicht committed Nov 30, 2024
1 parent b71e3fa commit 3faa300
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/make-disk-image.nix
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ in
done
${installer}
''}
echo "export origBuilder=$origBuilder" > xchg/saved-env
echo "export origBuilder=$origBuilder" >> xchg/saved-env
${preVM}
''}
export postVM=${diskoLib.writeCheckedBash { inherit pkgs checked; } "postVM.sh" postVM}
Expand Down

0 comments on commit 3faa300

Please sign in to comment.