diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch | |
parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
download | nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch')
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch new file mode 100644 index 00000000000..412daee9f27 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch @@ -0,0 +1,15 @@ +--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 ++++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 +@@ -322,7 +322,11 @@ + fallback: + #endif + +- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ if (g_getenv("GDM_X_SERVER") != NULL) { ++ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); ++ } else { ++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ } + } + + static gboolean |