Updating bashrc, so it does not leave in PATH (and other environment variables) a void element, which
the linux kernel would take as '.'. This fixes the bug of linux looking into '.' for executables. svn path=/nixos/trunk/; revision=21818
This commit is contained in:
parent
f13cf2cee0
commit
ee8ba3bb79
|
@ -21,22 +21,23 @@ unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS
|
|||
unset XDG_CONFIG_DIRS XDG_DATA_DIRS
|
||||
|
||||
for i in $NIX_PROFILES; do # !!! reverse
|
||||
export PATH=$i/bin:$i/sbin:$PATH
|
||||
export INFOPATH=$i/info:$i/share/info:$INFOPATH
|
||||
export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
# We have to care not leaving an empty PATH element, because that means '.' to Linux
|
||||
export PATH=$i/bin:$i/sbin${PATH:+:}$PATH
|
||||
export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
|
||||
export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
|
||||
|
||||
# "lib/site_perl" is for backwards compatibility with packages
|
||||
# from Nixpkgs <= 0.12.
|
||||
export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl:$PERL5LIB"
|
||||
export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
|
||||
|
||||
# GStreamer.
|
||||
export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
|
||||
export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
|
||||
|
||||
# KDE/Gnome stuff.
|
||||
export KDEDIRS=$i:$KDEDIRS
|
||||
export QT_PLUGIN_PATH=$i/plugins:$i/lib/qt4/plugins:$QT_PLUGIN_PATH
|
||||
export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
|
||||
export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
|
||||
export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
|
||||
export QT_PLUGIN_PATH=$i/plugins:$i/lib/qt4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
|
||||
export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
|
||||
export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
|
||||
done
|
||||
@shellInit@
|
||||
|
||||
|
|
Loading…
Reference in New Issue