mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity

Add /var/run/current-system/sw to NIX_PROFILES

Browse source 
Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
This commit is contained in:
Yury G. Kudryashov 2010-04-15 15:47:15 +00:00
parent a26d31d04c
commit 8324ccf755
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/programs/bash/bashrc.sh
View file

@ -3,7 +3,6 @@ if [ -n "$NOSYSBASHRC" ]; then
fi
# Initialise a bunch of environment variables.
export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
export MODULE_DIR=@modulesTree@/lib/modules
export NIXPKGS_CONFIG=/nix/etc/config.nix
@ -11,14 +10,15 @@ export NIXPKGS_ALL=/etc/nixos/nixpkgs
export PAGER="less -R"
export EDITOR=nano
export LOCATE_PATH=/var/cache/locatedb
export GST_PLUGIN_PATH=/var/run/current-system/sw/lib/gstreamer-0.10
@shellInit@
# Include the various profiles in the appropriate environment variables.
NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
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
@ -37,6 +37,7 @@ for i in $NIX_PROFILES; do # !!! reverse
export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
done
@shellInit@
# Search directory for Aspell dictionaries.

9
modules/services/x11/desktop-managers/kde-environment.nix
View file

@ -15,6 +15,8 @@ let
description = ''
Additional KDE packages to be used when you use KDE as a desktop
manager. By default, you only get the KDE base packages.
Just adds packages to systemPackages and x11Packages. Will be removed
in the future.
'';
};
@ -27,11 +29,6 @@ mkIf (kdePackages != [] && config.services.xserver.enable) {
environment = {
x11Packages = kdePackages;
shellInit = ''
export KDEDIRS="${pkgs.lib.concatStringsSep ":" kdePackages}"
export XDG_CONFIG_DIRS="${pkgs.lib.makeSearchPath "etc/xdg" kdePackages}"
export XDG_DATA_DIRS="${pkgs.lib.makeSearchPath "share" kdePackages}"
'';
systemPackages = kdePackages;
};
}