diff options
| author | Yury G. Kudryashov <urkud@urkud.name> | 2019-11-01 17:39:34 -0400 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud@urkud.name> | 2019-11-02 17:47:15 -0400 |
| commit | ba0a68c45b7b767525a0ba7f06e08035a9ad6614 (patch) | |
| tree | 07cbf7d4caab8509b0a02528a3f18659820155e2 /pkgs/applications/graphics/inkscape/default.nix | |
| parent | 39e559212716e200347c5af4aa09940ea55b13b4 (diff) | |
| download | nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.tar nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.tar.gz nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.tar.bz2 nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.tar.lz nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.tar.xz nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.tar.zst nixpkgs-ba0a68c45b7b767525a0ba7f06e08035a9ad6614.zip | |
inkscape: use latest poppler, use gtkspell2, drop `-fpermissive`
It seems that `inkscape-0.9.4` builds with the latest poppler and without the `-fpermissive` workaround.
Diffstat (limited to 'pkgs/applications/graphics/inkscape/default.nix')
| -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 ed1f61b98d3..c945412bc2c 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; |