···

       
134
       
134
       
 
       
        (*) echo "$0: Desktop manager '$desktopManager' not found.";;

     

       
135
       
135
       
 
       
      esac

     

       
136
       
136
       
 
       


     

       
137
       
137
       
+
       
      # FIXME: gdbus should not be in glib.dev!

     

       
137
       
138
       
 
       
      ${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) ''

     

       
138
       
138
       
-
       
        ${pkgs.glib}/bin/gdbus call --session \

     

       
139
       
139
       
+
       
        ${pkgs.glib.dev}/bin/gdbus call --session \

     

       
139
       
140
       
 
       
          --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \

     

       
140
       
141
       
 
       
          --method org.freedesktop.DBus.UpdateActivationEnvironment \

     

       
141
       
142
       
 
       
          "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \

     

···

       
11
       
11
       
 
       
      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme

     

       
12
       
12
       
 
       
      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
+
       
  # FIXME: glib binaries shouldn't be in .dev!

     

       
14
       
15
       
 
       
  preFixup = ''

     

       
15
       
16
       
 
       
    wrapProgram "$out/bin/gnome-session" \

     

       
16
       
16
       
-
       
      --prefix PATH : "${glib}/bin" \

     

       
17
       
17
       
+
       
      --prefix PATH : "${glib.dev}/bin" \

     

       
17
       
18
       
 
       
      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       
18
       
19
       
 
       
      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       
19
       
20
       
 
       
  '';

     

···

       
16
       
16
       
 
       
      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt

     

       
17
       
17
       
 
       
      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];

     

       
18
       
18
       
 
       


     

       
19
       
19
       
+
       
  # FIXME: glib binaries shouldn't be in .dev!

     

       
19
       
20
       
 
       
  preFixup = ''

     

       
20
       
21
       
 
       
    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \

     

       
21
       
22
       
 
       
      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       
22
       
22
       
-
       
      --prefix PATH : "${glib}/bin" \

     

       
23
       
23
       
+
       
      --prefix PATH : "${glib.dev}/bin" \

     

       
23
       
24
       
 
       
      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       
24
       
25
       
 
       
  '';

     

       
25
       
26