diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch index bd4e92e4aadb..2de3f651a327 100644 --- a/pkgs/by-name/gd/gdm/fix-paths.patch +++ b/pkgs/by-name/gd/gdm/fix-paths.patch @@ -1,13 +1,9 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 513b9733d..0c1c8007f 100644 +index ad2e65cf7..61fb78db8 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration { - const char *session_type; - } display_server_configuration[] = { - #ifdef ENABLE_WAYLAND_SUPPORT -- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, -+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" }, +@@ -272,7 +272,7 @@ struct GdmDisplayServerConfiguration { + { "wayland", GDM_KEY_WAYLAND_ENABLE, NULL, "wayland" }, #endif #ifdef ENABLE_X11_SUPPORT - { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, @@ -16,7 +12,7 @@ index 513b9733d..0c1c8007f 100644 { NULL, NULL, NULL }, }; diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index 9568e963f..b1bc8800a 100644 +index 457dcf88d..a71b89ba8 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -154,7 +154,7 @@ plymouth_is_running (void) diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 128d00c7bec8..b47e16314df3 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -27,7 +27,6 @@ plymouth, coreutils, xorgserver, - xwayland, dbus, nixos-icons, runCommand, @@ -44,7 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "49.0.1"; + version = "49.1"; outputs = [ "out" @@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-GbpC+GkqC/OlK9WX4amrKMnGpRiWpQgjBOX6GlGE2Bo="; + hash = "sha256-adpdExncLGit9c05StWb7Jm7LiTyhARaG7Ss13QAROU="; }; mesonFlags = [ @@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { coreutils plymouth xorgserver - xwayland dbus ; })