Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fb5f649bc987
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b7c90019251
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 11, 2019

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

    Not entirely sure how this works, but this does seem to fix reload switch
killing the current graphical session.
    @hedning
    hedning authored Oct 11, 2019
    Copy the full SHA
    5b7c900 View commit details
Showing with 5 additions and 3 deletions.
  1. +2 −2 nixos/modules/services/x11/display-managers/gdm.nix
  2. +3 −1 pkgs/desktops/gnome-3/core/gdm/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/display-managers/gdm.nix
View file
Original file line number Diff line number Diff line change
@@ -165,12 +165,12 @@ in
"rc-local.service"
"systemd-machined.service"
"systemd-user-sessions.service"
"getty@tty1.service"
"getty@tty${gdm.initialVT}.service"
"plymouth-quit.service"
"plymouth-start.service"
];
systemd.services.display-manager.conflicts = [
"getty@tty1.service"
"getty@tty${gdm.initialVT}.service"
"plymouth-quit.service"
];
systemd.services.display-manager.onFailure = [
4 changes: 3 additions & 1 deletion pkgs/desktops/gnome-3/core/gdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,12 +31,14 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
'';

initialVT = "7";

configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-plymouth=yes"
"--enable-gdm-xsession"
# "--with-initial-vt=7"
"--with-initial-vt=${initialVT}"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev"
];