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: 52f76b890722
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f74f2f354866
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 5, 2020

  1. nixos/gdm: fix startup 

    In 7f838b4, we dropped systemd-udev-settle.service from display-manager.service's wants.
Unfortunately, we are doing something wrong since without it both Xorg and Wayland fail to start:

	Failed to open gpu '/dev/dri/card0': GDBus.Error:org.freedesktop.DBus.Error.AccessDenied: Operation not permitted

Until we sort this out, let's add systemd-udev-settle.service to GDM to unblock the channels.
    @jtojnar
    jtojnar committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f74f2f3 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/services/x11/display-managers/gdm.nix
4 changes: 4 additions & 0 deletions nixos/modules/services/x11/display-managers/gdm.nix
View file
Original file line number Diff line number Diff line change
@@ -188,6 +188,9 @@ in
"systemd-machined.service"
# setSessionScript wants AccountsService
"accounts-daemon.service"
# Failed to open gpu '/dev/dri/card0': GDBus.Error:org.freedesktop.DBus.Error.AccessDenied: Operation not permitted
# https://github.com/NixOS/nixpkgs/pull/25311#issuecomment-609417621
"systemd-udev-settle.service"
];

systemd.services.display-manager.after = [
@@ -197,6 +200,7 @@ in
"getty@tty${gdm.initialVT}.service"
"plymouth-quit.service"
"plymouth-start.service"
"systemd-udev-settle.service"
];
systemd.services.display-manager.conflicts = [
"getty@tty${gdm.initialVT}.service"