summaryrefslogtreecommitdiffstats
path: root/shell.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-12-06 00:08:40 +0100
committerlassulus <lassulus@lassul.us>2017-12-06 00:08:40 +0100
commit1d6525a0050509ba1aa0b9ab66b8eb84946b8652 (patch)
tree28408aaa6529d38cd76ffbe61136ae4f004a3a56 /shell.nix
parent19781ae7a4897c8f67e98ac6c57b75bb0c3d06b4 (diff)
parent7b38d1a8219ff7cfa39202ff17f1c92bd799c9b0 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'shell.nix')
-rw-r--r--shell.nix3
1 files changed, 1 insertions, 2 deletions
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