From 0dd6bd214da0b3ec79400a2910a0ca0a580eccf8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 31 Dec 2017 05:22:15 +0000 Subject: [PATCH] xfce: resolve conflict with KDE This resolves some aspects of #33231, but GDK_PIXBUF_MODULE_FILE doesn't really belong to any DE module. --- nixos/modules/services/x11/desktop-managers/xfce.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 8c8f9a825ea2..9d5d03638e04 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;