nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 09:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #205890 from jtojnar/inkscape

Browse Source 
inkscape: 1.2.1 → 1.2.2
This commit is contained in:
Jan Tojnar 2022-12-13 17:56:53 +01:00 committed by GitHub
commit 539d47e35e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/graphics/inkscape/default.nix
View File

@ -5,7 +5,6 @@
, cairo , cairo
, cmake , cmake
, fetchurl , fetchurl
, fetchpatch
, gettext , gettext
, ghostscript , ghostscript
, glib , glib
@ -59,11 +58,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "inkscape"; pname = "inkscape";
version = "1.2.1"; version = "1.2.2";
src = fetchurl { src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
sha256 = "Rs59oOunykutwdtw6cu2fgrfm7NCaH3G4ItcohuNTBs="; sha256 = "oMf9DQPAohU15kjvMB3PgN18/B81ReUQZfvxuj7opcQ=";
}; };
# Inkscape hits the ARGMAX when linking on macOS. It appears to be # Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -79,12 +78,6 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu. # e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python"; python3 = "${python3Env}/bin/python";
}) })
# Fix build with Poppler 22.09
(fetchpatch {
url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch";
sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc=";
})
]; ];
postPatch = '' postPatch = ''

4
pkgs/development/libraries/lib2geom/default.nix
View File

@ -15,7 +15,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lib2geom"; pname = "lib2geom";
version = "1.2"; version = "1.2.2";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "inkscape"; owner = "inkscape";
repo = "lib2geom"; repo = "lib2geom";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY=";
}; };
patches = [ patches = [