glib: Add some FIXMEs about inappropriate outputs
This commit is contained in:
parent
d801e8a011
commit
01c197df68
|
@ -134,8 +134,9 @@ let
|
|||
(*) echo "$0: Desktop manager '$desktopManager' not found.";;
|
||||
esac
|
||||
|
||||
# FIXME: gdbus should not be in glib.dev!
|
||||
${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) ''
|
||||
${pkgs.glib}/bin/gdbus call --session \
|
||||
${pkgs.glib.dev}/bin/gdbus call --session \
|
||||
--dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
|
||||
--method org.freedesktop.DBus.UpdateActivationEnvironment \
|
||||
"{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \
|
||||
|
|
|
@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
|
|||
gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
|
||||
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
|
||||
|
||||
# FIXME: glib binaries shouldn't be in .dev!
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/gnome-session" \
|
||||
--prefix PATH : "${glib}/bin" \
|
||||
--prefix PATH : "${glib.dev}/bin" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
|
|
@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
|
|||
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
|
||||
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
|
||||
|
||||
# FIXME: glib binaries shouldn't be in .dev!
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix PATH : "${glib}/bin" \
|
||||
--prefix PATH : "${glib.dev}/bin" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue