pyrox.dev
xfce: resolve conflict with KDE
This resolves some aspects of #33231, but GDK_PIXBUF_MODULE_FILE doesn't really belong to any DE module.
authored by Yegor Timoshenko and committed by GitHub 0dd6bd21 64965e82
+1
-6
nixos/modules/services/x11/desktop-managers/xfce.nix
+1
-6
nixos/modules/services/x11/desktop-managers/xfce.nix
···
3
with lib;
4
5
let
6
-
7
xcfg = config.services.xserver;
8
pcfg = config.hardware.pulseaudio;
9
cfg = xcfg.desktopManager.xfce;
10
-
11
in
12
13
{
14
options = {
15
-
16
services.xserver.desktopManager.xfce = {
17
enable = mkOption {
18
type = types.bool;
···
125
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
126
127
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
128
-
environment.variables.GDK_PIXBUF_MODULE_FILE = [
129
-
"$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-*/*/loaders.cache)"
130
-
];
131
132
# Enable helpful DBus services.
133
services.udisks2.enable = true;
···
3
with lib;
4
5
let
6
xcfg = config.services.xserver;
7
pcfg = config.hardware.pulseaudio;
8
cfg = xcfg.desktopManager.xfce;
9
in
10
11
{
12
options = {
13
services.xserver.desktopManager.xfce = {
14
enable = mkOption {
15
type = types.bool;
···
122
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
123
124
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
125
+
environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
126
127
# Enable helpful DBus services.
128
services.udisks2.enable = true;