summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmbroz Bizjak <ambrop7@gmail.com>2017-03-18 11:49:43 +0100
committerAmbroz Bizjak <ambrop7@gmail.com>2017-03-18 12:00:23 +0100
commitf80eeb5d854cc5b0ae6f66616c1f29aabf0e0279 (patch)
tree4653afc00bddc89b4cc17de64cf767269697866f
parent54aff5c3a72578c99ba767ecc6ff35ecdaa0e0e2 (diff)
downloadnixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.tar
nixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.tar.gz
nixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.tar.bz2
nixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.tar.lz
nixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.tar.xz
nixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.tar.zst
nixlib-f80eeb5d854cc5b0ae6f66616c1f29aabf0e0279.zip
nixos: Define XCURSOR_PATH environment variable.
In the absence of XCURSOR_PATH, the function XcursorLibraryPath
in libXcursor will return a hardcoded value unsuitable for NixOS.
Some desktops as well as display managers in NixOS currently do
set XCURSOR_PATH, but there are combinations where neither does
(e.g. SDDM+XFCE), resulting in no cursor themes being available.

The new definition if XCURSOR_PATH is effectively the same as what
KDE's startkde currently does.

Fixes issue #21442.
-rw-r--r--nixos/modules/programs/environment.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index a1615c920c02..48a1e2a0a883 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -20,6 +20,7 @@ in
       { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
         PAGER = mkDefault "less -R";
         EDITOR = mkDefault "nano";
+        XCURSOR_PATH = "$HOME/.icons";
       };
 
     environment.profiles =
@@ -42,6 +43,7 @@ in
         GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ];
         XDG_DATA_DIRS = [ "/share" ];
+        XCURSOR_PATH = [ "/share/icons" ];
         MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
         LIBEXEC_PATH = [ "/lib/libexec" ];
       };