Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stockholm: drop OLD_PATH

Browse Source
This commit is contained in:
tv 2017-12-06 00:02:17 +01:00
parent 289dd785e5
commit 7b38d1a821
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/5pkgs/simple/stockholm/default.nix
View File

@ -120,10 +120,6 @@
. ${init.proxy "install" opts} . ${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 # these variables get defined by nix-shell (i.e. nix-build) from
# XDG_RUNTIME_DIR and reference the wrong directory (/run/user/0), # XDG_RUNTIME_DIR and reference the wrong directory (/run/user/0),
# which only exists on / and not at /mnt. # which only exists on / and not at /mnt.

3
shell.nix
View File

@ -5,14 +5,13 @@ let
in pkgs.stdenv.mkDerivation { in pkgs.stdenv.mkDerivation {
name = "stockholm"; name = "stockholm";
shellHook = /* sh */ '' shellHook = /* sh */ ''
export OLD_PATH="$PATH"
export NIX_PATH=stockholm=${toString ./.}:nixpkgs=${toString <nixpkgs>} export NIX_PATH=stockholm=${toString ./.}:nixpkgs=${toString <nixpkgs>}
if test -e /nix/var/nix/daemon-socket/socket; then if test -e /nix/var/nix/daemon-socket/socket; then
export NIX_REMOTE=daemon export NIX_REMOTE=daemon
fi fi
export PATH=${lib.makeBinPath [ export PATH=${lib.makeBinPath [
pkgs.stockholm pkgs.stockholm
]} ]}''${PATH+:$PATH}
eval "$(declare -F | ${pkgs.gnused}/bin/sed s/declare/unset/)" eval "$(declare -F | ${pkgs.gnused}/bin/sed s/declare/unset/)"
shopt -u no_empty_cmd_completion shopt -u no_empty_cmd_completion