BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xfce: resolve conflict with KDE

Browse source 
This resolves some aspects of #33231, but GDK_PIXBUF_MODULE_FILE doesn't really belong to any DE module.
This commit is contained in:
Yegor Timoshenko 2017-12-31 05:22:15 +00:00 committed by GitHub
parent 64965e8224
commit 0dd6bd214d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/x11/desktop-managers/xfce.nix
View file

@ -3,16 +3,13 @@
with lib; with lib;
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
pcfg = config.hardware.pulseaudio; pcfg = config.hardware.pulseaudio;
cfg = xcfg.desktopManager.xfce; cfg = xcfg.desktopManager.xfce;
in in
{ {
options = { options = {
services.xserver.desktopManager.xfce = { services.xserver.desktopManager.xfce = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -125,9 +122,7 @@ in
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; [ "/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.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
environment.variables.GDK_PIXBUF_MODULE_FILE = [ environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
"$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-*/*/loaders.cache)"
];
# Enable helpful DBus services. # Enable helpful DBus services.
services.udisks2.enable = true; services.udisks2.enable = true;