forked from mirrors/nixpkgs
inkscape: add wrapGAppsHook for icons (fixed for strictDeps)
Resolves #68185. The icons in Inkscape depend on gdk-pixbuf loaders, but because strictDeps is set to true to fix some macOS issues it doesn't work (see #56943). Adding librsvg to buildInputs explicitly fixes the issue.
This commit is contained in:
parent
c025f5c03d
commit
cd04b610ba
|
@ -3,6 +3,7 @@
|
||||||
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
|
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
|
||||||
, gsl, python2, poppler, imagemagick, libwpg, librevenge
|
, gsl, python2, poppler, imagemagick, libwpg, librevenge
|
||||||
, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme
|
, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme
|
||||||
|
, librsvg, wrapGAppsHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||||
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
|
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]
|
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ]
|
||||||
++ (with perlPackages; [ perl XMLParser ]);
|
++ (with perlPackages; [ perl XMLParser ]);
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libXft libpng zlib popt boehmgc
|
libXft libpng zlib popt boehmgc
|
||||||
|
@ -48,6 +49,8 @@ stdenv.mkDerivation rec {
|
||||||
gsl poppler imagemagick libwpg librevenge
|
gsl poppler imagemagick libwpg librevenge
|
||||||
libvisio libcdr libexif potrace hicolor-icon-theme
|
libvisio libcdr libexif potrace hicolor-icon-theme
|
||||||
|
|
||||||
|
librsvg # for loading icons
|
||||||
|
|
||||||
python2Env perlPackages.perl
|
python2Env perlPackages.perl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue