git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #113171 from andersk/gnome-session-shutdown-delay

gnome-session: Fix 2 minute shutdown delay

commit859d5405086477cf1433922d853bde1b6f4a8642 authorJan Tojnar <jtojnar@gmail.com> dateMon 15 Feb 2021, 05:47 (6 years ago) parent3f0e6e170cf070
1 file changed+8−1
pkgs/desktops/gnome-3/core/gnome-session/default.nix+8−1
pkgs/desktops/gnome-3/core/gnome-session/default.nix+8−1
@@ -1,6 +1,7 @@
11{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas
22, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
3−, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
3+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl
4+, fetchpatch }:
45
56stdenv.mkDerivation rec {
67 pname = "gnome-session";
@@ -21,6 +22,12 @@ stdenv.mkDerivation rec {
2122 grep = "${gnugrep}/bin/grep";
2223 bash = "${bash}/bin/bash";
2324 })
25+ # Fixes 2 minute delay at poweroff.
26+ # https://gitlab.gnome.org/GNOME/gnome-session/issues/74
27+ (fetchpatch {
28+ url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff";
29+ sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz";
30+ })
2431 ];
2532
2633 mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];