jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome3.gdm: 3.26.0 → 3.26.2.1

Browse Source
This commit is contained in:
Jan Tojnar 2017-11-14 23:55:19 +01:00
parent 7600abe61c
commit 613a2fa13a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
View File

@ -1,19 +0,0 @@
diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c
index d835b34..86f0d47 100644
--- a/daemon/gdm-x-session.c.orig
+++ b/daemon/gdm-x-session.c
@@ -240,7 +240,13 @@ spawn_x_server (State *state,
display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- g_ptr_array_add (arguments, X_SERVER);
+ if (g_getenv ("GDM_X_SERVER") != NULL) {
+ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER"));
+ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER"));
+ } else {
+ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER);
+ g_ptr_array_add (arguments, X_SERVER);
+ }
if (vt_string != NULL) {
g_ptr_array_add (arguments, vt_string);

6
pkgs/desktops/gnome-3/core/gdm/src.nix
View File

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gdm-3.26.0";
name = "gdm-3.26.2.1";
src = fetchurl {
url = mirror://gnome/sources/gdm/3.26/gdm-3.26.0.tar.xz;
sha256 = "1ng8vkijwrbq8hjzmmi5ai2m4cq3f1g0rbynx5rddgi7n33cmf5g";
url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz;
sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
};
}