about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-09-08 20:59:08 +0200
committerGitHub <noreply@github.com>2019-09-08 20:59:08 +0200
commit975d5f18eba6f89b2c0d0d143344a793f70ef3f4 (patch)
tree20e148c554f55bd07f57542ad4930fc2c2c651f0
parent1a1a7ed26652545dc6a2e2bd02f7812e1b37d196 (diff)
parentcd04b610ba34e3081dd81c82d9e7d3c247128279 (diff)
downloadnixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.tar
nixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.tar.gz
nixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.tar.bz2
nixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.tar.lz
nixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.tar.xz
nixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.tar.zst
nixlib-975d5f18eba6f89b2c0d0d143344a793f70ef3f4.zip
Merge pull request #68287 from rileyinman/inkscape-strictdeps
inkscape: add wrapGAppsHook for icons (fixed for strictDeps)
-rw-r--r--pkgs/applications/graphics/inkscape/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 1729f3c5cdab..547e2914399b 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -3,6 +3,7 @@
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme
+, librsvg, wrapGAppsHook
 }:
 
 let
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ]
     ++ (with perlPackages; [ perl XMLParser ]);
   buildInputs = [
     libXft libpng zlib popt boehmgc
@@ -48,6 +49,8 @@ stdenv.mkDerivation rec {
     gsl poppler imagemagick libwpg librevenge
     libvisio libcdr libexif potrace hicolor-icon-theme
 
+    librsvg # for loading icons
+
     python2Env perlPackages.perl
   ];