summaryrefslogtreecommitdiff
path: root/os/common/modules/nix
diff options
context:
space:
mode:
authorsinanmohd <sinan@sinanmohd.com>2025-10-14 18:12:15 +0530
committersinanmohd <sinan@sinanmohd.com>2025-10-17 08:19:58 +0530
commit8c3ada3cdb868150be288223b9524fb152db26bc (patch)
tree663b47032106be6e44c646359b2ee0d707136db8 /os/common/modules/nix
parente9e51be6d7a149fbd122db51d6a2bf2673f12827 (diff)
feat(os/kay): init headscale
Diffstat (limited to 'os/common/modules/nix')
-rw-r--r--os/common/modules/nix/nix.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/os/common/modules/nix/nix.patch b/os/common/modules/nix/nix.patch
index 4f565d8..606e61d 100644
--- a/os/common/modules/nix/nix.patch
+++ b/os/common/modules/nix/nix.patch
@@ -1,8 +1,8 @@
diff --git a/develop.cc b/develop.cc
-index ed25e655d8f..f78eee59abc 100644
+index c27c254fb..e914d5f6c 100644
--- a/develop.cc
+++ b/develop.cc
-@@ -627,13 +627,12 @@ struct CmdDevelop : Common, MixEnvironment
+@@ -629,13 +629,12 @@ struct CmdDevelop : Common, MixEnvironment
fmt("[ -n \"$PS1\" ] && PS1+=%s;\n", escapeShellArgAlways(developSettings.bashPromptSuffix.get()));
}
@@ -10,14 +10,14 @@ index ed25e655d8f..f78eee59abc 100644
-
setEnviron();
// prevent garbage collection until shell exits
- setEnv("NIX_GCROOT", gcroot.c_str());
+ setEnv("NIX_GCROOT", store->printStorePath(gcroot).c_str());
Path shell = "bash";
+ bool foundInteractive = false;
try {
auto state = getEvalState();
-@@ -656,19 +655,17 @@ struct CmdDevelop : Common, MixEnvironment
+@@ -658,19 +657,17 @@ struct CmdDevelop : Common, MixEnvironment
Strings{"legacyPackages." + settings.thisSystem.get() + "."},
nixpkgsLockFlags);
@@ -39,7 +39,7 @@ index ed25e655d8f..f78eee59abc 100644
throw Error("package 'nixpkgs#bashInteractive' does not provide a 'bin/bash'");
} catch (Error &) {
-@@ -678,6 +675,11 @@ struct CmdDevelop : Common, MixEnvironment
+@@ -680,6 +677,11 @@ struct CmdDevelop : Common, MixEnvironment
// Override SHELL with the one chosen for this environment.
// This is to make sure the system shell doesn't leak into the build environment.
setEnv("SHELL", shell.c_str());