summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@gmail.com>2017-12-31 05:22:15 +0000
committerGitHub <noreply@github.com>2017-12-31 05:22:15 +0000
commit0dd6bd214da0b3ec79400a2910a0ca0a580eccf8 (patch)
tree9f30400eb38d866b40d5b61921ad71fcabafa586 /nixos
parent64965e8224021b8d449de906f6e8b5a4b5b2c5d9 (diff)
downloadnixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.tar
nixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.tar.gz
nixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.tar.bz2
nixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.tar.lz
nixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.tar.xz
nixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.tar.zst
nixpkgs-0dd6bd214da0b3ec79400a2910a0ca0a580eccf8.zip
xfce: resolve conflict with KDE
This resolves some aspects of #33231, but GDK_PIXBUF_MODULE_FILE doesn't really belong to any DE module.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce.nix7
1 files changed, 1 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 8c8f9a825ea..9d5d03638e0 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -3,16 +3,13 @@
 with lib;
 
 let
-
   xcfg = config.services.xserver;
   pcfg = config.hardware.pulseaudio;
   cfg = xcfg.desktopManager.xfce;
-
 in
 
 {
   options = {
-
     services.xserver.desktopManager.xfce = {
       enable = mkOption {
         type = types.bool;
@@ -125,9 +122,7 @@ in
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
 
     environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
-    environment.variables.GDK_PIXBUF_MODULE_FILE = [
-      "$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-*/*/loaders.cache)"
-    ];
+    environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;