diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-10 20:30:27 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-02 19:06:41 +0200 |
commit | 1f6a15d7ded115ece48419cb1e642816b2145db5 (patch) | |
tree | 07e603f94e373d26851227995bdc4847db2c09f5 /pkgs/desktops/gnome-3/core/baobab | |
parent | 1046b4ccabdef4313520fb41be627232ffa44fc0 (diff) | |
download | nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.tar nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.tar.gz nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.tar.bz2 nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.tar.lz nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.tar.xz nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.tar.zst nixlib-1f6a15d7ded115ece48419cb1e642816b2145db5.zip |
Merge #1901: add preFixupPhases to stdenv; for gsettings
Without this stdenv change it seems difficult to fix some glib's gsettings issues, as the folders in question may (not) be created in installPhase.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/baobab')
-rw-r--r-- | pkgs/desktops/gnome-3/core/baobab/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 07805644d906..5121f1f69bec 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, vala, libgtop , pkgconfig, gtk3, glib, hicolor_icon_theme , bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf }: +, gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { name = "baobab-3.10.1"; @@ -22,19 +22,14 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - installFlags = "gsettingsschemadir=\${out}/share/baobab/glib-2.0/schemas/"; - - postInstall = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/baobab:$XDG_ICON_DIRS" - ''; + gnome3.gsettings_desktop_schemas makeWrapper file ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache rm $out/share/icons/HighContrast/icon-theme.cache + wrapProgram "$out/bin/baobab" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { |