diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/applications/graphics | |
parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/dia/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/graphics/glabels/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 10 |
3 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index ef63cb97a7359..949dce7132bea 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, -libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, +libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 - libxslt docbook_xsl libart_lgpl ] + libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] ++ stdenv.lib.optional withGNOME libgnomeui ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command - # It have no reasons to exist in a redistribuable package - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index b4715902df1f1..df8ebee020c91 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig +, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -17,11 +17,10 @@ stdenv.mkDerivation rec { barcode gtk3 gtk-doc gnome3.yelp-tools gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool - + hicolor-icon-theme ]; preFixup = '' - rm "$out/share/icons/hicolor/icon-theme.cache" wrapProgram "$out/bin/glabels-3" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index a82f13ee409ab..f4d08195309b0 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,7 +2,7 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme }: let @@ -44,15 +44,13 @@ stdenv.mkDerivation rec { libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace + libvisio libcdr libexif potrace hicolor-icon-theme ]; enableParallelBuilding = true; - postInstall = '' - # Make sure PyXML modules can be found at run-time. - rm -f "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Make sure PyXML modules can be found at run-time. + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; |