about summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-18 11:15:26 -0400
committerGitHub <noreply@github.com>2019-09-18 11:15:26 -0400
commitee29fbd9a2f6b6f8222e4a0711baeb404406aedd (patch)
tree095b65e8904a711c898b300fbdc83b31a6a6d60c /nixos/modules/programs
parenteb59755f70b5f3d675de509178ebc57346d6601b (diff)
parent6663a795a3da44555f01cc04b90edd4157306bbb (diff)
downloadnixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.tar
nixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.tar.gz
nixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.tar.bz2
nixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.tar.lz
nixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.tar.xz
nixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.tar.zst
nixlib-ee29fbd9a2f6b6f8222e4a0711baeb404406aedd.zip
Merge pull request #68492 from worldofpeace/pam-sessionvariables
Introduce environment.profileRelativeSessionVariables
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/environment.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 66eb83482664..4bbc750fd52e 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -22,6 +22,8 @@ in
         EDITOR = mkDefault "nano";
         XCURSOR_PATH = [ "$HOME/.icons" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
+        GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes
+        GTK_EXE_PREFIX = "${config.system.path}";
       };
 
     environment.profiles = mkAfter
@@ -30,7 +32,7 @@ in
       ];
 
     # TODO: move most of these elsewhere
-    environment.profileRelativeEnvVars =
+    environment.profileRelativeSessionVariables =
       { PATH = [ "/bin" ];
         INFOPATH = [ "/info" "/share/info" ];
         KDEDIRS = [ "" ];