diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-04 21:33:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-04 21:33:55 +0200 |
| commit | 10147beecfbef6d1029650a854e5f53827f7deca (patch) | |
| tree | 1cdd7cabab0eb564110b92cf944e30bb79ab4ac2 /pkgs/desktops | |
| parent | 4ab58240a9c5cf977767965d978a8f6bb7127f41 (diff) | |
| parent | 685d5a02a23a6fa52a82a79f3ec27d659c5a8a3f (diff) | |
| download | nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.gz nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.bz2 nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.lz nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.xz nixlib-10147beecfbef6d1029650a854e5f53827f7deca.tar.zst nixlib-10147beecfbef6d1029650a854e5f53827f7deca.zip | |
Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates. There's glibc 2.18 -> .19 bump and many non-intrusive PRs. The grsecurity branch #1187 got removed at Eelco's request, see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
Diffstat (limited to 'pkgs/desktops')
| -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; { |