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

gnome3.gdm: fix wayland detection

Browse Source 
Apparently, wayland session were not used at all until now.
This commit is contained in:
Jan Tojnar 2018-04-27 19:03:19 +02:00
parent 6f23e142cb
commit 3bfa8563d1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/core/gdm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
, librsvg, coreutils }:
, librsvg, coreutils, xwayland }:
stdenv.mkDerivation rec {
name = "gdm-${version}";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit coreutils plymouth;
inherit coreutils plymouth xwayland;
})
./sessions_dir.patch
./gdm-x-session_extra_args.patch

11
pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
View File

@ -1,3 +1,14 @@
--- 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 @@