From 036e00a16dc68ba80059ba0378ed90f6a9196cd4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Apr 2008 12:14:15 +0000 Subject: [PATCH] * 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 --- etc/profile.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/profile.sh b/etc/profile.sh index 30fc8217fdf..3696012f61b 100644 --- a/etc/profile.sh +++ b/etc/profile.sh @@ -1,5 +1,8 @@ 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 NIXPKGS_CONFIG=/nix/etc/config.nix export PAGER="less -R"