diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-08-29 22:38:12 +0200 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-09-07 19:41:00 +0200 |
| commit | becde6132bf4847b80666aecb619032c286cc733 (patch) | |
| tree | 63e43850803a2d04393b0108d7e45f429f8718e9 /nixos/modules/programs/environment.nix | |
| parent | 388b7baa735612aab9080b0c612e3a5085912207 (diff) | |
| download | nixpkgs-becde6132bf4847b80666aecb619032c286cc733.tar nixpkgs-becde6132bf4847b80666aecb619032c286cc733.tar.gz nixpkgs-becde6132bf4847b80666aecb619032c286cc733.tar.bz2 nixpkgs-becde6132bf4847b80666aecb619032c286cc733.tar.lz nixpkgs-becde6132bf4847b80666aecb619032c286cc733.tar.xz nixpkgs-becde6132bf4847b80666aecb619032c286cc733.tar.zst nixpkgs-becde6132bf4847b80666aecb619032c286cc733.zip | |
Replace environment.profileVariables by environment.profileRelativeEnvVars
Diffstat (limited to 'nixos/modules/programs/environment.nix')
| -rw-r--r-- | nixos/modules/programs/environment.nix | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 6bf98442013..623a428fc1a 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -37,25 +37,24 @@ in "/run/current-system/sw" ]; - # !!! fix environment.profileVariables definition and then move - # most of these elsewhere - environment.profileVariables = (i: - { PATH = [ "${i}/bin" "${i}/sbin" "${i}/lib/kde4/libexec" ]; - MANPATH = [ "${i}/man" "${i}/share/man" ]; - INFOPATH = [ "${i}/info" "${i}/share/info" ]; - PKG_CONFIG_PATH = [ "${i}/lib/pkgconfig" ]; - TERMINFO_DIRS = [ "${i}/share/terminfo" ]; - PERL5LIB = [ "${i}/lib/perl5/site_perl" ]; - ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ]; - KDEDIRS = [ "${i}" ]; - STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ]; - QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ]; - QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ]; - GTK_PATH = [ "${i}/lib/gtk-2.0" "${i}/lib/gtk-3.0" ]; - XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ]; - XDG_DATA_DIRS = [ "${i}/share" ]; - MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ]; - }); + # TODO: move most of these elsewhere + environment.profileRelativeEnvVars = + { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ]; + MANPATH = [ "/man" "/share/man" ]; + INFOPATH = [ "/info" "/share/info" ]; + PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; + TERMINFO_DIRS = [ "/share/terminfo" ]; + PERL5LIB = [ "/lib/perl5/site_perl" ]; + ALSA_PLUGIN_DIRS = [ "/lib/alsa-lib" ]; + KDEDIRS = [ "" ]; + STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; + QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; + QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; + GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; + XDG_CONFIG_DIRS = [ "/etc/xdg" ]; + XDG_DATA_DIRS = [ "/share" ]; + MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ]; + }; environment.extraInit = '' |