diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
| commit | ddbe9191ef1549e7695e5e02e545b1b3db46edb4 (patch) | |
| tree | 90e8f4e8bf5c4410b351229cdc637333bae88024 /pkgs/desktops/gnome-3/core/gdm/fix-paths.patch | |
| parent | 16b6f53910f19b84c5d8c5fb58a8ce958fc8a7d3 (diff) | |
| parent | f3fcf1b0a9b0398620b5fa9b40268ef651aa373e (diff) | |
| download | nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.gz nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.bz2 nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.lz nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.xz nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.zst nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it!
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gdm/fix-paths.patch')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gdm/fix-paths.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch new file mode 100644 index 000000000000..adac2dc913cc --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch @@ -0,0 +1,60 @@ +--- a/daemon/gdm-local-display-factory.c ++++ b/daemon/gdm-local-display-factory.c +@@ -450,7 +450,7 @@ + #ifdef ENABLE_WAYLAND_SUPPORT + gboolean wayland_enabled = FALSE; + if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { +- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) { ++ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) { + session_type = "wayland"; + } + } +--- a/daemon/gdm-manager.c ++++ b/daemon/gdm-manager.c +@@ -147,7 +147,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_sync ("/bin/plymouth --ping", ++ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping", + NULL, NULL, &status, &error); + if (! res) { + g_debug ("Could not ping plymouth: %s", error->message); +@@ -165,7 +165,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_sync ("/bin/plymouth deactivate", ++ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate", + NULL, NULL, NULL, &error); + if (! res) { + g_warning ("Could not deactivate plymouth: %s", error->message); +@@ -180,7 +180,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_async ("/bin/plymouth quit --retain-splash", &error); ++ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error); + if (! res) { + g_warning ("Could not quit plymouth: %s", error->message); + g_error_free (error); +@@ -196,7 +196,7 @@ + GError *error; + + error = NULL; +- res = g_spawn_command_line_async ("/bin/plymouth quit", &error); ++ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error); + if (! res) { + g_warning ("Could not quit plymouth: %s", error->message); + g_error_free (error); +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -28,7 +28,7 @@ + StandardOutput=syslog + StandardError=inherit + EnvironmentFile=-@LANG_CONFIG_FILE@ +-ExecReload=/bin/kill -SIGHUP $MAINPID ++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID + + [Install] + Alias=display-manager.service |