movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

inkscape: 1.4 -> 1.4.1

Browse source 
Fixes build with latest Poppler.
This commit is contained in:
K900 2025-05-10 00:41:47 +03:00
parent c1848e8bbb
commit 9737e0f8cd
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/graphics/inkscape/default.nix
View file

@ -74,11 +74,11 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "inkscape"; pname = "inkscape";
version = "1.4"; version = "1.4.1";
src = fetchurl { src = fetchurl {
url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; 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 # Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true; strictDeps = true;
patches = [ 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 { (replaceVars ./fix-python-paths.patch {
# Python is used at run-time to execute scripts, # Python is used at run-time to execute scripts,
# e.g., those from the "Effects" menu. # e.g., those from the "Effects" menu.

12
pkgs/development/python-modules/inkex/default.nix
View file

@ -7,7 +7,6 @@
cssselect, cssselect,
lxml, lxml,
numpy, numpy,
packaging,
pillow, pillow,
pygobject3, pygobject3,
pyparsing, pyparsing,
@ -17,7 +16,6 @@
gobject-introspection, gobject-introspection,
pytestCheckHook, pytestCheckHook,
gtk3, gtk3,
fetchpatch2,
}: }:
buildPythonPackage { buildPythonPackage {
@ -27,16 +25,6 @@ buildPythonPackage {
inherit (inkscape) src; 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 ]; build-system = [ poetry-core ];
pythonRelaxDeps = [ "numpy" ]; pythonRelaxDeps = [ "numpy" ];