Merge pull request #113171 from andersk/gnome-session-shutdown-delay

gnome-session: Fix 2 minute shutdown delay
This commit is contained in:
Jan Tojnar 2021-02-15 05:47:08 +01:00 committed by GitHub
commit 859d540508
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl
, fetchpatch }:
stdenv.mkDerivation rec {
pname = "gnome-session";
@ -21,6 +22,12 @@ stdenv.mkDerivation rec {
grep = "${gnugrep}/bin/grep";
bash = "${bash}/bin/bash";
})
# Fixes 2 minute delay at poweroff.
# https://gitlab.gnome.org/GNOME/gnome-session/issues/74
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff";
sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz";
})
];
mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];