From 7b38d1a8219ff7cfa39202ff17f1c92bd799c9b0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 6 Dec 2017 00:02:17 +0100
Subject: [PATCH] stockholm: drop OLD_PATH

---
 krebs/5pkgs/simple/stockholm/default.nix | 4 ----
 shell.nix                                | 3 +--
 2 files changed, 1 insertion(+), 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