public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nixos/xfce: use sessionPackages" 

This reverts commit 966e56cdfb.

See https://github.com/NixOS/nixpkgs/pull/78421#issuecomment-582891431.
This commit is contained in:
worldofpeace 2020-02-07 10:16:26 -05:00
parent d35c686843
commit 5e307dc68d
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -127,9 +127,14 @@ in
"/share/gtksourceview-4.0" "/share/gtksourceview-4.0"
]; ];
services.xserver.displayManager.sessionPackages = [ services.xserver.desktopManager.session = [{
pkgs.xfce.xfce4-session name = "xfce";
]; bgSupport = true;
start = ''
${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
waitPID=$!
'';
}];
services.xserver.updateDbusEnvironment = true; services.xserver.updateDbusEnvironment = true;
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];

22
pkgs/desktops/xfce/core/xfce4-session/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session, runtimeShell }: { mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
mkXfceDerivation { mkXfceDerivation {
category = "xfce"; category = "xfce";
@ -14,25 +14,9 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468 # See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
# Don't use startxfce4 in xfce.desktop passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
# It's has FHS isms
postFixup = ''
chmod +x $out/etc/xdg/xfce4/xinitrc
patchShebangs $out/etc/xdg/xfce4/xinitrc
substituteInPlace "$out/share/xsessions/xfce.desktop" \ meta = {
--replace "Exec=startxfce4" "Exec=$out/etc/xdg/xfce4/xinitrc"
'';
passthru = {
xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
providedSessions = [
"xfce"
];
};
meta = {
description = "Session manager for Xfce"; description = "Session manager for Xfce";
}; };
} }