pyrox.dev
gdm: 47.alpha → 47.0
https://gitlab.gnome.org/GNOME/gdm/-/compare/47.alpha...47.0
Applied from pull request 343127.
Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
authored by Fabián Heredia Montiel and committed by Bobby Rong 4a614c4a 8f30f0bd
+2
-2
pkgs/by-name/gd/gdm/fix-paths.patch
+2
-2
pkgs/by-name/gd/gdm/fix-paths.patch
···
1
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
2
-
index f2d8e155b..54b998826 100644
3
--- a/daemon/gdm-local-display-factory.c
4
+++ b/daemon/gdm-local-display-factory.c
5
@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
···
9
- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
10
+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" },
11
#endif
12
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
13
+ { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" },
14
{ NULL, NULL, NULL },
15
};
16
-
17
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
18
index fc5aef6ac..c61e0046b 100644
19
--- a/daemon/gdm-manager.c
···
1
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
2
--- a/daemon/gdm-local-display-factory.c
3
+++ b/daemon/gdm-local-display-factory.c
4
@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
···
8
- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
9
+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" },
10
#endif
11
+
#ifdef ENABLE_X11_SUPPORT
12
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
13
+ { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" },
14
+
#endif
15
{ NULL, NULL, NULL },
16
};
17
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
18
index fc5aef6ac..c61e0046b 100644
19
--- a/daemon/gdm-manager.c
+7
-7
pkgs/by-name/gd/gdm/package.nix
+7
-7
pkgs/by-name/gd/gdm/package.nix
···
10
glib,
11
json-glib,
12
itstool,
13
-
xorg,
14
accountsservice,
15
libX11,
16
gnome,
17
systemd,
18
dconf,
19
gtk3,
20
-
libcanberra-gtk3,
21
pam,
22
libgudev,
23
libselinux,
···
44
45
stdenv.mkDerivation (finalAttrs: {
46
pname = "gdm";
47
-
version = "47.alpha";
48
49
outputs = [
50
"out"
···
53
54
src = fetchurl {
55
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
56
-
hash = "sha256-A1lcGdkSyPUOWYsDcGCXzBPLhT90NbfReJKMPvYOMag=";
57
};
58
59
mesonFlags = [
···
85
gtk3
86
keyutils
87
libX11
88
-
libcanberra-gtk3
89
libgudev
90
libselinux
91
pam
92
plymouth
93
systemd
94
-
xorg.libXdmcp
95
];
96
97
patches = [
···
136
postPatch = ''
137
# Upstream checks some common paths to find an `X` binary. We already know it.
138
echo #!/bin/sh > build-aux/find-x-server.sh
139
-
echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
140
patchShebangs build-aux/find-x-server.sh
141
142
# Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7
···
10
glib,
11
json-glib,
12
itstool,
13
accountsservice,
14
libX11,
15
+
libXdmcp,
16
+
libxcb,
17
gnome,
18
systemd,
19
dconf,
20
gtk3,
21
pam,
22
libgudev,
23
libselinux,
···
44
45
stdenv.mkDerivation (finalAttrs: {
46
pname = "gdm";
47
+
version = "47.0";
48
49
outputs = [
50
"out"
···
53
54
src = fetchurl {
55
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
56
+
hash = "sha256-xYWDJr+8yKzlgTUuK+RGItwOnlwoAchpD9Lu1QJgf4Q=";
57
};
58
59
mesonFlags = [
···
85
gtk3
86
keyutils
87
libX11
88
+
libXdmcp
89
+
libxcb
90
libgudev
91
libselinux
92
pam
93
plymouth
94
systemd
95
];
96
97
patches = [
···
136
postPatch = ''
137
# Upstream checks some common paths to find an `X` binary. We already know it.
138
echo #!/bin/sh > build-aux/find-x-server.sh
139
+
echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh
140
patchShebangs build-aux/find-x-server.sh
141
142
# Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7