public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glib: Add some FIXMEs about inappropriate outputs

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 05:05:42 +03:00
parent d801e8a011
commit 01c197df68
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/display-managers/default.nix
View File

@ -134,8 +134,9 @@ let
(*) echo "$0: Desktop manager '$desktopManager' not found.";; (*) echo "$0: Desktop manager '$desktopManager' not found.";;
esac esac
# FIXME: gdbus should not be in glib.dev!
${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) '' ${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 \ --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
--method org.freedesktop.DBus.UpdateActivationEnvironment \ --method org.freedesktop.DBus.UpdateActivationEnvironment \
"{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \ "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \

3
pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix
View File

@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
# FIXME: glib binaries shouldn't be in .dev!
preFixup = '' preFixup = ''
wrapProgram "$out/bin/gnome-session" \ wrapProgram "$out/bin/gnome-session" \
--prefix PATH : "${glib}/bin" \ --prefix PATH : "${glib.dev}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
''; '';

3
pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
View File

@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
# FIXME: glib binaries shouldn't be in .dev!
preFixup = '' preFixup = ''
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --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" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
''; '';