···

       
50
       
50
       
 
       
        exec > ~/.xsession-errors 2>&1

     

       
51
       
51
       
 
       
      ''}

     

       
52
       
52
       
 
       


     

       
53
       
53
       
+
       
      ${optionalString cfg.startDbusSession ''

     

       
54
       
54
       
+
       
        if test -z "$DBUS_SESSION_BUS_ADDRESS"; then

     

       
55
       
55
       
+
       
          exec ${pkgs.dbus.tools}/bin/dbus-launch --exit-with-session "$0" "$sessionType"

     

       
56
       
56
       
+
       
        fi

     

       
57
       
57
       
+
       
      ''}

     

       
58
       
58
       
+
       


     

       
53
       
59
       
 
       
      ${optionalString cfg.displayManager.desktopManagerHandlesLidAndPower ''

     

       
54
       
60
       
 
       
        # Stop systemd from handling the power button and lid switch,

     

       
55
       
61
       
 
       
        # since presumably the desktop environment will handle these.

     

···

       
238
       
238
       
 
       
        '';

     

       
239
       
239
       
 
       
      };

     

       
240
       
240
       
 
       


     

       
241
       
241
       
+
       
      startDbusSession = mkOption {

     

       
242
       
242
       
+
       
        type = types.bool;

     

       
243
       
243
       
+
       
        default = true;

     

       
244
       
244
       
+
       
        description = ''

     

       
245
       
245
       
+
       
          Whether to start a new DBus session when you log in with dbus-launch.

     

       
246
       
246
       
+
       
        '';

     

       
247
       
247
       
+
       
      };

     

       
248
       
248
       
+
       


     

       
241
       
249
       
 
       
      layout = mkOption {

     

       
242
       
250
       
 
       
        type = types.str;

     

       
243
       
251
       
 
       
        default = "us";

     

···

       
27
       
27
       
 
       


     

       
28
       
28
       
 
       
  preBuild = ''

     

       
29
       
29
       
 
       
    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'

     

       
30
       
30
       
-
       
    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'

     

       
31
       
30
       
 
       
  '';

     

       
32
       
31
       
 
       


     

       
33
       
32
       
 
       
  # Disable Access Control because our X does not support FamilyServerInterpreted yet

     

       
34
       
34
       
-
       
  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];

     

       
33
       
33
       
+
       
  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ];

     

       
35
       
34
       
 
       


     

       
36
       
35
       
 
       
  meta = with stdenv.lib; {

     

       
37
       
36
       
 
       
    homepage = https://wiki.gnome.org/Projects/GDM;

     

···

       
1
       
1
       
+
       
--- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000

     

       
2
       
2
       
+
       
+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000

     

       
3
       
3
       
+
       
@@ -48,8 +48,6 @@

     

       
4
       
4
       
+
       
 #include "gdm-session-enum-types.h"

     

       
5
       
5
       
+
       
 #include "gdm-launch-environment.h"

     

       
6
       
6
       
+
       
 

     

       
7
       
7
       
+
       
-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"

     

       
8
       
8
       
+
       
-

     

       
9
       
9
       
+
       
 extern char **environ;

     

       
10
       
10
       
+
       
 

     

       
11
       
11
       
+
       
 #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))

     

       
12
       
12
       
+
       
@@ -512,7 +510,7 @@

     

       
13
       
13
       
+
       
                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);

     

       
14
       
14
       
+
       
         } else {

     

       
15
       
15
       
+
       
                 /* wrap it in dbus-launch */

     

       
16
       
16
       
+
       
-                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);

     

       
17
       
17
       
+
       
+                char *command = g_strdup (launch_environment->priv->command);

     

       
18
       
18
       
+
       
 

     

       
19
       
19
       
+
       
                 gdm_session_select_program (launch_environment->priv->session, command);

     

       
20
       
20
       
+
       
                 g_free (command);