summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-12-06 00:02:17 +0100
committertv <tv@krebsco.de>2017-12-06 00:02:17 +0100
commit7b38d1a8219ff7cfa39202ff17f1c92bd799c9b0 (patch)
tree2c43cdbd4ba1a3252f0a21be659cfa22f678e62a
parent289dd785e5bd5f3a628a7f0282ed4f8638277c5c (diff)
stockholm: drop OLD_PATH
-rw-r--r--krebs/5pkgs/simple/stockholm/default.nix4
-rw-r--r--shell.nix3
2 files changed, 1 insertions, 6 deletions
diff --git a/krebs/5pkgs/simple/stockholm/default.nix b/krebs/5pkgs/simple/stockholm/default.nix
index da07c8120..5705f086d 100644
--- a/krebs/5pkgs/simple/stockholm/default.nix
+++ b/krebs/5pkgs/simple/stockholm/default.nix
@@ -120,10 +120,6 @@
. ${init.proxy "install" opts}
- # Reset PATH because we need access to nixos-install.
- # TODO provide nixos-install instead of relying on prepare.sh
- export PATH="$OLD_PATH"
-
# these variables get defined by nix-shell (i.e. nix-build) from
# XDG_RUNTIME_DIR and reference the wrong directory (/run/user/0),
# which only exists on / and not at /mnt.
diff --git a/shell.nix b/shell.nix
index 6c6b7cad7..bfdf1b3ca 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,14 +5,13 @@ let
in pkgs.stdenv.mkDerivation {
name = "stockholm";
shellHook = /* sh */ ''
- export OLD_PATH="$PATH"
export NIX_PATH=stockholm=${toString ./.}:nixpkgs=${toString <nixpkgs>}
if test -e /nix/var/nix/daemon-socket/socket; then
export NIX_REMOTE=daemon
fi
export PATH=${lib.makeBinPath [
pkgs.stockholm
- ]}
+ ]}''${PATH+:$PATH}
eval "$(declare -F | ${pkgs.gnused}/bin/sed s/declare/unset/)"
shopt -u no_empty_cmd_completion