diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-07-05 11:42:41 +0200 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-07-05 12:18:17 +0200 |
| commit | ac711a705eb921460eb598480caca13b4ba68464 (patch) | |
| tree | 4fb5ffedfed3a97b59ca27fb7327e93d4f7e2207 | |
| parent | 6365987e539a2bfe079df24b8b8362364fbb2ca8 (diff) | |
| download | nixlib-ac711a705eb921460eb598480caca13b4ba68464.tar nixlib-ac711a705eb921460eb598480caca13b4ba68464.tar.gz nixlib-ac711a705eb921460eb598480caca13b4ba68464.tar.bz2 nixlib-ac711a705eb921460eb598480caca13b4ba68464.tar.lz nixlib-ac711a705eb921460eb598480caca13b4ba68464.tar.xz nixlib-ac711a705eb921460eb598480caca13b4ba68464.tar.zst nixlib-ac711a705eb921460eb598480caca13b4ba68464.zip | |
dfeet: fix icons
| -rw-r--r-- | pkgs/development/tools/misc/d-feet/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index d4847afc786b..852c1b742195 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,7 +1,6 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, pango, gdk_pixbuf, atk, pep8, python, makeWrapper -, pygobject3, gobjectIntrospection, libwnck3 -, gnome_icon_theme }: +, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3 +, pygobject3, gobjectIntrospection, libwnck3 }: let version = "${major}.8"; @@ -18,16 +17,19 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic makeWrapper pygobject3 libwnck3 ]; - postInstall = + preFixup = '' wrapProgram $out/bin/d-feet \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" + + rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a043912dc8b7..40640320276a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3869,7 +3869,6 @@ let dfeet = callPackage ../development/tools/misc/d-feet { inherit (pythonPackages) pep8; - inherit (gnome3) gnome_icon_theme; }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; |