mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 04:05:40 +03:00
inkscape: 1.4 -> 1.4.1
Fixes build with latest Poppler.
This commit is contained in:
parent
c1848e8bbb
commit
9737e0f8cd
2 changed files with 2 additions and 20 deletions
|
@ -74,11 +74,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "inkscape";
|
||||
version = "1.4";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U=";
|
||||
sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI=";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
|
@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# fix typo in gobjectptr member function. remove on update
|
||||
name = "gobjectptr-fix-member-name.patch";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch";
|
||||
hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q=";
|
||||
})
|
||||
(replaceVars ./fix-python-paths.patch {
|
||||
# Python is used at run-time to execute scripts,
|
||||
# e.g., those from the "Effects" menu.
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
cssselect,
|
||||
lxml,
|
||||
numpy,
|
||||
packaging,
|
||||
pillow,
|
||||
pygobject3,
|
||||
pyparsing,
|
||||
|
@ -17,7 +16,6 @@
|
|||
gobject-introspection,
|
||||
pytestCheckHook,
|
||||
gtk3,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
|
@ -27,16 +25,6 @@ buildPythonPackage {
|
|||
|
||||
inherit (inkscape) src;
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "add-numpy-2-support.patch";
|
||||
url = "https://gitlab.com/inkscape/extensions/-/commit/13ebc1e957573fea2c3360f676b0f1680fad395d.patch";
|
||||
hash = "sha256-0n8L8dUaYYPBsmHlAxd60c5zqfK6NmXJfWZVBXPbiek=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "share/extensions/";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [ "numpy" ];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue