inkscape: 0.92.5 -> 1.0

This commit is contained in:
Pavol Rusnak 2020-04-14 10:55:08 +02:00
parent 7eb4a0ae27
commit 5107b24c83
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 49 additions and 16 deletions

View File

@ -3,14 +3,18 @@
, boost
, cairo
, cmake
, fetchpatch
, double-conversion
, fetchurl
, gettext
, gdl
, glib
, glib-networking
, glibmm
, gsl
, gtkmm2
, gtkspell2
, gtk-mac-integration
, gtkmm3
, gtkspell3
, gdk-pixbuf
, imagemagick
, lcms
, libcdr
@ -19,18 +23,20 @@
, librevenge
, librsvg
, libsigcxx
, libsoup
, libvisio
, libwpg
, libXft
, libxml2
, libxslt
, makeWrapper
, ninja
, perlPackages
, pkg-config
, poppler
, popt
, potrace
, python3
, substituteAll
, wrapGAppsHook
, zlib
}:
@ -44,11 +50,11 @@ let
in
stdenv.mkDerivation rec {
pname = "inkscape";
version = "0.92.5";
version = "1.0";
src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.bz2";
sha256 = "02wsa66ifycibmgfsrhmhqdv41brg955lffq8drsjr5xw9lpzvl1";
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
sha256 = "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9";
};
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -57,21 +63,28 @@ stdenv.mkDerivation rec {
# will leave us under ARGMAX.
strictDeps = true;
patches = [
(substituteAll {
src = ./fix-python-paths.patch;
# Python is used at run-time to execute scripts,
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
];
postPatch = ''
patchShebangs share/extensions
patchShebangs fix-roff-punct
# Python is used at run-time to execute scripts, e.g., those from
# the "Effects" menu.
substituteInPlace src/extension/implementation/script.cpp \
--replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"'
patchShebangs share/templates
patchShebangs man/fix-roff-punct
'';
nativeBuildInputs = [
pkg-config
cmake
makeWrapper
ninja
python3Env
glib # for setup hook
gdk-pixbuf # for setup hook
wrapGAppsHook
] ++ (with perlPackages; [
perl
@ -81,11 +94,14 @@ stdenv.mkDerivation rec {
buildInputs = [
boehmgc
boost
double-conversion
gdl
gettext
glib
glib-networking
glibmm
gsl
gtkmm2
gtkmm3
imagemagick
lcms
libcdr
@ -94,6 +110,7 @@ stdenv.mkDerivation rec {
librevenge
librsvg # for loading icons
libsigcxx
libsoup
libvisio
libwpg
libXft
@ -106,9 +123,10 @@ stdenv.mkDerivation rec {
python3Env
zlib
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
gtkspell2
gtkspell3
] ++ stdenv.lib.optionals stdenv.isDarwin [
cairo
gtk-mac-integration
];
# Make sure PyXML modules can be found at run-time.

View File

@ -0,0 +1,15 @@
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -77,10 +77,10 @@ const std::map<std::string, Script::inte
{ "python", {"python-interpreter", {"pythonw" }}},
#elif defined __APPLE__
{ "perl", {"perl-interpreter", {"perl" }}},
- { "python", {"python-interpreter", {"python3" }}},
+ { "python", {"python-interpreter", {"@python3@" }}},
#else
{ "perl", {"perl-interpreter", {"perl" }}},
- { "python", {"python-interpreter", {"python3", "python" }}},
+ { "python", {"python-interpreter", {"@python3@" }}},
#endif
{ "python2", {"python2-interpreter", {"python2", "python" }}},
{ "ruby", {"ruby-interpreter", {"ruby" }}},