diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-11-03 06:52:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 06:52:59 +0000 |
| commit | 07da1ca8b5198fa13f39506f7a525bbf6300cf7c (patch) | |
| tree | b20cdcce3c7626ed6c911b44eccc11f1e52dafee /pkgs/applications/graphics | |
| parent | 8bddbbaf849f83285e0844be1ec6fb92e6343dfd (diff) | |
| parent | ba0a68c45b7b767525a0ba7f06e08035a9ad6614 (diff) | |
| download | nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.tar nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.tar.gz nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.tar.bz2 nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.tar.lz nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.tar.xz nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.tar.zst nixlib-07da1ca8b5198fa13f39506f7a525bbf6300cf7c.zip | |
Merge pull request #72491 from urkud/inkscape-cleanup
inkscape: use latest poppler, use gtkspell2, drop `-fpermissive`
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ed1f61b98d3a..c945412bc2c9 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perlPackages, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper -, gsl, python2, poppler, imagemagick, libwpg, librevenge +, gsl, gtkspell2, python2, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, potrace, cmake , librsvg, wrapGAppsHook }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { librsvg # for loading icons python2Env perlPackages.perl - ]; + ] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2; enableParallelBuilding = true; @@ -62,9 +62,6 @@ stdenv.mkDerivation rec { install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; - # 0.92.3 complains about an invalid conversion from const char * to char * - NIX_CFLAGS_COMPILE = " -fpermissive "; - meta = with stdenv.lib; { license = "GPL"; homepage = https://www.inkscape.org; |