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

gnome3.gdm: remove a patch since X supports access control now

Browse Source
This commit is contained in:
Domen Kožar 2015-05-05 12:40:21 +02:00
parent 3a080a2d89
commit ee0ecb520e
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
'';
# Disable Access Control because our X does not support FamilyServerInterpreted yet
patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_env.patch ];
patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GDM;

18
pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
View File

@ -1,18 +0,0 @@
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 1afe48e..e3d1ec2 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -291,9 +291,10 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
gdm_error_trap_push ();
- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
XAddHost (slave->priv->server_display, &host_entries[i]);
- }
+ }*/
+ XDisableAccessControl(slave->priv->server_display);
XSync (slave->priv->server_display, False);
if (gdm_error_trap_pop ()) {