dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lib2geom: 1.2.2 → 1.3

Browse Source 
https://gitlab.com/inkscape/lib2geom/-/releases/1.3

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
leiserfg 2023-07-25 21:32:16 +02:00 committed by Jan Tojnar
parent 8efd5d1e28
commit aae20a0f43
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
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.2"; version = "1.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -23,16 +23,19 @@ stdenv.mkDerivation rec {
owner = "inkscape"; owner = "inkscape";
repo = "lib2geom"; repo = "lib2geom";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY="; hash = "sha256-llUpW8VRBD8RKaGfyedzsMbLRb8DIo0ePt6m2T2w7Po=";
}; };
patches = [ patches = [
# Fixed upstream, remove when the new version releases: # Fix compilation with Clang.
# https://gitlab.com/inkscape/lib2geom/-/issues/49 # https://gitlab.com/inkscape/lib2geom/-/merge_requests/102
(fetchpatch { (fetchpatch {
name = "expect-double-eq-in-choose-test.patch"; url = "https://gitlab.com/inkscape/lib2geom/-/commit/a5b5ac7d992023f8a80535ede60421e73ecd8e20.patch";
url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch"; hash = "sha256-WJYkk3WRYVyPSvyTbKDUrYvUwFgKA9mmTiEWtYQqM4Q=";
sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50="; })
(fetchpatch {
url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch";
hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA=";
}) })
]; ];
@ -60,6 +63,20 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
# TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829
checkPhase = let
disabledTests =
lib.optionals stdenv.isAarch64 [
# Broken on all platforms, test just accidentally passes on some.
# https://gitlab.com/inkscape/lib2geom/-/issues/63
"elliptical-arc-test"
];
in ''
runHook preCheck
ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$'
runHook postCheck
'';
meta = with lib; { meta = with lib; {
description = "Easy to use 2D geometry library in C++"; description = "Easy to use 2D geometry library in C++";
homepage = "https://gitlab.com/inkscape/lib2geom"; homepage = "https://gitlab.com/inkscape/lib2geom";