Merge pull request #173184 from matthuszagh/inkscape-1.2
inkscape: 1.1.2 -> 1.2
This commit is contained in:
commit
b8b0e0adfb
|
@ -5,7 +5,6 @@
|
|||
, cairo
|
||||
, cmake
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, ghostscript
|
||||
, glib
|
||||
|
@ -44,20 +43,25 @@
|
|||
let
|
||||
python3Env = python3.withPackages
|
||||
(ps: with ps; [
|
||||
appdirs
|
||||
beautifulsoup4
|
||||
cachecontrol
|
||||
numpy
|
||||
lxml
|
||||
pillow
|
||||
scour
|
||||
pyserial
|
||||
]);
|
||||
requests
|
||||
pygobject3
|
||||
] ++ inkex.propagatedBuildInputs);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inkscape";
|
||||
version = "1.1.2";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE=";
|
||||
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
|
||||
sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0=";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
|
@ -73,20 +77,6 @@ stdenv.mkDerivation rec {
|
|||
# e.g., those from the "Effects" menu.
|
||||
python3 = "${python3Env}/bin/python";
|
||||
})
|
||||
|
||||
# Fix build with poppler 22.03
|
||||
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4187
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch";
|
||||
sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg=";
|
||||
})
|
||||
|
||||
# Fix build with poppler 22.04
|
||||
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4266
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch";
|
||||
sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
{ buildPythonPackage
|
||||
, inkscape
|
||||
, cssselect
|
||||
, lxml
|
||||
, numpy
|
||||
, pygobject3
|
||||
, python
|
||||
}:
|
||||
|
||||
|
@ -11,7 +14,10 @@ buildPythonPackage {
|
|||
format = "other";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cssselect
|
||||
lxml
|
||||
numpy
|
||||
pygobject3
|
||||
];
|
||||
|
||||
# We just copy the files.
|
||||
|
|
Loading…
Reference in a new issue