BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inkscape: use latest poppler, use gtkspell2, drop -fpermissive

Browse source 
It seems that `inkscape-0.9.4` builds with the latest poppler and
without the `-fpermissive` workaround.
This commit is contained in:
Yury G. Kudryashov 2019-11-01 17:39:34 -04:00
parent 39e5592127
commit ba0a68c45b
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 { stdenv, fetchurl, pkgconfig, perlPackages, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge , gsl, gtkspell2, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, potrace, cmake , libvisio, libcdr, libexif, potrace, cmake
, librsvg, wrapGAppsHook , librsvg, wrapGAppsHook
}: }:
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
librsvg # for loading icons librsvg # for loading icons
python2Env perlPackages.perl python2Env perlPackages.perl
]; ] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2;
enableParallelBuilding = true; 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 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; { meta = with stdenv.lib; {
license = "GPL"; license = "GPL";
homepage = https://www.inkscape.org; homepage = https://www.inkscape.org;

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

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