diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 05:05:42 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 05:05:42 +0300 |
| commit | 01c197df689a9794885a80d965311696377e0efb (patch) | |
| tree | 02a561b73e816bce7c269eb29f917d9b6d8cf0e1 /pkgs/desktops | |
| parent | d801e8a01185d06ec766a88db6dfbe01fd5b82e8 (diff) | |
| download | nixlib-01c197df689a9794885a80d965311696377e0efb.tar nixlib-01c197df689a9794885a80d965311696377e0efb.tar.gz nixlib-01c197df689a9794885a80d965311696377e0efb.tar.bz2 nixlib-01c197df689a9794885a80d965311696377e0efb.tar.lz nixlib-01c197df689a9794885a80d965311696377e0efb.tar.xz nixlib-01c197df689a9794885a80d965311696377e0efb.tar.zst nixlib-01c197df689a9794885a80d965311696377e0efb.zip | |
glib: Add some FIXMEs about inappropriate outputs
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix index 8f876386f323..69b908ec01ed 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix @@ -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" ''; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix index 2a93328d8ca0..00999353c2fb 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix @@ -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" ''; |