diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-05 12:40:21 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-05 12:40:21 +0200 |
| commit | ee0ecb520eb3577e2d508fc11dbc057aca9b6c23 (patch) | |
| tree | 0b4933c49c6bf5e46b17dbad4226c731dc5dd406 /pkgs/desktops | |
| parent | 3a080a2d894b90246d632453297d3340c8fdcb03 (diff) | |
| download | nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.tar nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.tar.gz nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.tar.bz2 nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.tar.lz nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.tar.xz nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.tar.zst nixlib-ee0ecb520eb3577e2d508fc11dbc057aca9b6c23.zip | |
gnome3.gdm: remove a patch since X supports access control now
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.12/core/gdm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch | 18 |
2 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix index 46e300383647..a939a8d4fd9f 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -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; diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch deleted file mode 100644 index 5985dbe0e017..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch +++ /dev/null @@ -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 ()) { - |