MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove unused gdm/3.16-wip

Browse source
This commit is contained in:
Tom Hunger 2017-08-28 19:52:06 +01:00
parent d269d8dbd6
commit 64e4b9637b
4 changed files with 0 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
View file

@ -1,41 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "gdm-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
};
preConfigure = ''
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
'';
configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-initial-vt=10" ];
buildInputs = [ pkgconfig glib itstool libxml2 intltool
accountsservice gnome3.dconf systemd
gobjectIntrospection libX11 gtk
libcanberra_gtk3 pam libtool ];
#enableParallelBuilding = true; # problems compiling
# Disable Access Control because our X does not support FamilyServerInterpreted yet
patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GDM;
description = "A program that manages graphical display servers and handles graphical user logins";
platforms = platforms.linux;
maintainers = gnome3.maintainers;
};
}

15
pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
View file

@ -1,15 +0,0 @@
--- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200
+++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200
@@ -1706,9 +1706,10 @@
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 (self->priv->x11_display, &host_entries[i]);
- }
+ }*/
+ XDisableAccessControl(self->priv->x11_display);
XSync (self->priv->x11_display, False);
if (gdm_error_trap_pop ()) {

17
pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
View file

@ -1,17 +0,0 @@
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index f759d2d..d154716 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -373,9 +373,12 @@ get_system_session_dirs (void)
#ifdef ENABLE_WAYLAND_SUPPORT
DATADIR "/wayland-sessions/",
#endif
+ NULL,
NULL
};
+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
+
return search_dirs;
}

83
pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
View file

@ -1,83 +0,0 @@
--- 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
--- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200
+++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200
@@ -207,6 +207,8 @@
char *display_fd_string = NULL;
char *vt_string = NULL;
char *display_number;
+ int nixos_argc = 0;
+ char **nixos_argv = NULL;
gsize display_number_size;
auth_file = prepare_auth_file ();
@@ -236,7 +238,15 @@
display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- g_ptr_array_add (arguments, X_SERVER);
+ if (g_getenv("GDM_X_SERVER") != NULL) {
+ int i = 0;
+ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
+ for (i = 0; i < nixos_argc; i++) {
+ g_ptr_array_add (arguments, nixos_argv[i]);
+ }
+ } else {
+ g_ptr_array_add (arguments, X_SERVER);
+ }
if (vt_string != NULL) {
g_ptr_array_add (arguments, vt_string);
@@ -259,12 +269,12 @@
g_ptr_array_add (arguments, "-noreset");
g_ptr_array_add (arguments, "-keeptty");
- g_ptr_array_add (arguments, "-verbose");
+ /*g_ptr_array_add (arguments, "-verbose");
if (state->debug_enabled) {
g_ptr_array_add (arguments, "7");
} else {
g_ptr_array_add (arguments, "3");
- }
+ }*/
if (state->debug_enabled) {
g_ptr_array_add (arguments, "-core");
@@ -275,6 +285,9 @@
(const char * const *) arguments->pdata,
&error);
g_free (display_fd_string);
+ if (nixos_argv) {
+ g_strfreev (nixos_argv);
+ }
g_clear_object (&launcher);
g_ptr_array_free (arguments, TRUE);
--- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200
+++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200
@@ -2359,6 +2359,12 @@
gchar *desktop_names;
const char *locale;
+ if (g_getenv ("GDM_X_SERVER") != NULL) {
+ gdm_session_set_environment_variable (self,
+ "GDM_X_SERVER",
+ g_getenv ("GDM_X_SERVER"));
+ }
+
gdm_session_set_environment_variable (self,
"GDMSESSION",
get_session_name (self));