From 4a614c4adb4e37de3d7da66ea62ac1e9de339d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 19 Sep 2024 23:58:57 +0000
Subject: [PATCH] =?UTF-8?q?gdm:=2047.alpha=20=E2=86=92=2047.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gdm/-/compare/47.alpha...47.0

Applied from pull request 343127.

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
---
 pkgs/by-name/gd/gdm/fix-paths.patch |  4 ++--
 pkgs/by-name/gd/gdm/package.nix     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch
index 4ad417285f27..93763ce5ff09 100644
--- a/pkgs/by-name/gd/gdm/fix-paths.patch
+++ b/pkgs/by-name/gd/gdm/fix-paths.patch
@@ -1,5 +1,4 @@
 diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
-index f2d8e155b..54b998826 100644
 --- a/daemon/gdm-local-display-factory.c
 +++ b/daemon/gdm-local-display-factory.c
 @@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
@@ -9,11 +8,12 @@ index f2d8e155b..54b998826 100644
 -        { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
 +        { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" },
  #endif
+ #ifdef ENABLE_X11_SUPPORT
 -        { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
 +        { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" },
+ #endif
          { NULL, NULL, NULL },
  };
- 
 diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
 index fc5aef6ac..c61e0046b 100644
 --- a/daemon/gdm-manager.c
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index e2460d430393..cdf66774135a 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -10,14 +10,14 @@
   glib,
   json-glib,
   itstool,
-  xorg,
   accountsservice,
   libX11,
+  libXdmcp,
+  libxcb,
   gnome,
   systemd,
   dconf,
   gtk3,
-  libcanberra-gtk3,
   pam,
   libgudev,
   libselinux,
@@ -44,7 +44,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdm";
-  version = "47.alpha";
+  version = "47.0";
 
   outputs = [
     "out"
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-A1lcGdkSyPUOWYsDcGCXzBPLhT90NbfReJKMPvYOMag=";
+    hash = "sha256-xYWDJr+8yKzlgTUuK+RGItwOnlwoAchpD9Lu1QJgf4Q=";
   };
 
   mesonFlags = [
@@ -85,13 +85,13 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     keyutils
     libX11
-    libcanberra-gtk3
+    libXdmcp
+    libxcb
     libgudev
     libselinux
     pam
     plymouth
     systemd
-    xorg.libXdmcp
   ];
 
   patches = [
@@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Upstream checks some common paths to find an `X` binary. We already know it.
     echo #!/bin/sh > build-aux/find-x-server.sh
-    echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
+    echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh
     patchShebangs build-aux/find-x-server.sh
 
     # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7