From 3faa300212095bc5ceed32825d788553242612ec Mon Sep 17 00:00:00 2001
From: Felix Uhl <github@mail.felix-uhl.de>
Date: Sat, 30 Nov 2024 17:36:29 +0100
Subject: [PATCH] disk-image: Fix compatibility with nixpkgs unstable

Fixes #900

This was caused by https://github.com/NixOS/nixpkgs/pull/354535
originally. The breaking changes introduced there have been resolved by
https://github.com/NixOS/nixpkgs/pull/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.
---
 lib/make-disk-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix
index 0180c708..be491f7b 100644
--- a/lib/make-disk-image.nix
+++ b/lib/make-disk-image.nix
@@ -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}