* Don't add nssModulePath when it's empty, because then we get
an empty element in the LD_LIBRARY_PATH, which means search for libraries in the current directory. svn path=/nixos/trunk/; revision=11545
This commit is contained in:
parent
10cc22203e
commit
036e00a16d
|
@ -1,5 +1,8 @@
|
||||||
export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
|
export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
|
||||||
export LD_LIBRARY_PATH=@nssModulesPath@:/var/run/current-system/sw/lib
|
export LD_LIBRARY_PATH=/var/run/current-system/sw/lib
|
||||||
|
if test -n "@nssModulesPath@"; then
|
||||||
|
LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
|
||||||
|
fi
|
||||||
export MODULE_DIR=@modulesTree@/lib/modules
|
export MODULE_DIR=@modulesTree@/lib/modules
|
||||||
export NIXPKGS_CONFIG=/nix/etc/config.nix
|
export NIXPKGS_CONFIG=/nix/etc/config.nix
|
||||||
export PAGER="less -R"
|
export PAGER="less -R"
|
||||||
|
|
Loading…
Reference in New Issue