diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-15 05:47:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 05:47:08 +0100 |
| commit | 859d5405086477cf1433922d853bde1b6f4a8642 (patch) | |
| tree | 6b09271bc65af2603b9055b5fb0bb3af02dc39c0 /pkgs/desktops/gnome-3 | |
| parent | 3f0e6e1daaa071b38121029c12de7c260286d719 (diff) | |
| parent | 70cf0705f61433c5bc88ab069f84bae7f8efaccf (diff) | |
Merge pull request #113171 from andersk/gnome-session-shutdown-delay
gnome-session: Fix 2 minute shutdown delay
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-session/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index d2dca54b5ca46..1fa0a0b0fc64d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -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" ]; |