diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-07 10:16:26 -0500 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-07 10:16:26 -0500 |
commit | 5e307dc68d9ba72a056543fb0b9b9b8772515313 (patch) | |
tree | f6f29d14ad0519df92035f23722f94ed0628d303 /pkgs/desktops | |
parent | d35c686843b15bfe47d89eb6c67304505b485884 (diff) |
Revert "nixos/xfce: use sessionPackages"
This reverts commit 966e56cdfbedc8be3dce8c5ea6050ce4d3075103. See https://github.com/NixOS/nixpkgs/pull/78421#issuecomment-582891431.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/xfce/core/xfce4-session/default.nix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index f97c07156c583..0ab362aa21d07 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -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 { category = "xfce"; @@ -14,25 +14,9 @@ mkXfceDerivation { # See https://github.com/NixOS/nixpkgs/issues/36468 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - # Don't use startxfce4 in xfce.desktop - # It's has FHS isms - postFixup = '' - chmod +x $out/etc/xdg/xfce4/xinitrc - patchShebangs $out/etc/xdg/xfce4/xinitrc + passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - substituteInPlace "$out/share/xsessions/xfce.desktop" \ - --replace "Exec=startxfce4" "Exec=$out/etc/xdg/xfce4/xinitrc" - ''; - - passthru = { - xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - - providedSessions = [ - "xfce" - ]; - }; - - meta = { + meta = { description = "Session manager for Xfce"; }; } |