Merge remote-tracking branch 'ni/master'

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.

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