public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72491 from urkud/inkscape-cleanup

Browse Source 
inkscape: use latest poppler, use gtkspell2, drop `-fpermissive`
This commit is contained in:
Michael Raskin 2019-11-03 06:52:59 +00:00 committed by GitHub
commit 07da1ca8b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/graphics/inkscape/default.nix
View File

@ -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;

1
pkgs/top-level/all-packages.nix
View File

@ -19248,7 +19248,6 @@ in
inkscape = callPackage ../applications/graphics/inkscape {
lcms = lcms2;
poppler = poppler_0_61;
};
inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { };