diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-17 18:27:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-17 18:36:19 +0000 |
| commit | c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1 (patch) | |
| tree | 981e746cc5db1250184038c87d38e86659b44a30 | |
| parent | 9001fd5c7b505f5b4db8c72608719c6adbecd310 (diff) | |
| download | spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.tar spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.tar.gz spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.tar.bz2 spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.tar.lz spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.tar.xz spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.tar.zst spectrum-c524495093e4ad7b4d6eeea0d90b9d6d8951f0e1.zip | |
img/app: fix shellHook override
Not preserving the original shellHook here meant that the extra values
for the PACKAGES variable didn't end up being set, so when used in a
nix-shell, the image ended up not containing /nix.
Fixes: 75a1ac3 ("vm: switch to EROFS")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
| -rw-r--r-- | img/app/shell.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/img/app/shell.nix b/img/app/shell.nix index 22e9644..ba75fcc 100644 --- a/img/app/shell.nix +++ b/img/app/shell.nix @@ -7,7 +7,7 @@ import ../../lib/eval-config.nix ( with config.pkgs; (import ./. { inherit config; }).overrideAttrs ( -{ nativeBuildInputs ? [], ... }: +{ nativeBuildInputs ? [], shellHook ? "", ... }: { nativeBuildInputs = nativeBuildInputs ++ [ @@ -19,7 +19,7 @@ with config.pkgs; ]; runDef = import run { inherit config; }; - shellHook = '' + shellHook = shellHook + '' export RUN_IMG="$(printf "%s\n" "$runDef"/blk/run.img)" ''; })) |