MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nixos/gdm: do not restart on reload switch (#70357)

Browse source 
Not entirely sure how this works, but this does seem to fix reload switch
killing the current graphical session.
This commit is contained in:
Tor Hedin Brønner 2019-10-11 20:07:16 +02:00 committed by GitHub
parent fb5f649bc9
commit 5b7c900192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/display-managers/gdm.nix
View file

@ -165,12 +165,12 @@ in
"rc-local.service" "rc-local.service"
"systemd-machined.service" "systemd-machined.service"
"systemd-user-sessions.service" "systemd-user-sessions.service"
"getty@tty1.service" "getty@tty${gdm.initialVT}.service"
"plymouth-quit.service" "plymouth-quit.service"
"plymouth-start.service" "plymouth-start.service"
]; ];
systemd.services.display-manager.conflicts = [ systemd.services.display-manager.conflicts = [
"getty@tty1.service" "getty@tty${gdm.initialVT}.service"
"plymouth-quit.service" "plymouth-quit.service"
]; ];
systemd.services.display-manager.onFailure = [ systemd.services.display-manager.onFailure = [

4
pkgs/desktops/gnome-3/core/gdm/default.nix
View file

@ -31,12 +31,14 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
''; '';
initialVT = "7";
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-plymouth=yes" "--with-plymouth=yes"
"--enable-gdm-xsession" "--enable-gdm-xsession"
# "--with-initial-vt=7" "--with-initial-vt=${initialVT}"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=$(out)/lib/udev"
]; ];