diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/lib2geom | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/lib2geom')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lib2geom/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index 0c97f116a0bf..e0db2b76f19e 100644 --- a/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -37,6 +37,17 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch"; hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA="; }) + + # Fix ellipses rendering near page corners. + # https://gitlab.com/inkscape/lib2geom/-/issues/66 + (fetchpatch { + url = "https://gitlab.com/inkscape/lib2geom/-/commit/039ce8d4af23a0a2a9d48eb970b321d9795dcc08.patch"; + hash = "sha256-JfgGrqBcYSYKcdl4Bt7vGZ4aTBPSHM6JjZ95IlzxPwI="; + }) + (fetchpatch { + url = "https://gitlab.com/inkscape/lib2geom/-/commit/cf523857e48c87f9f6a09217bdf935fff457823d.patch"; + hash = "sha256-BRg8ANHMSgoi6vt9PNbhwG1fRkzEPXb4gPTPO3sY0XE="; + }) ]; nativeBuildInputs = [ @@ -70,7 +81,13 @@ stdenv.mkDerivation rec { # Broken on all platforms, test just accidentally passes on some. # https://gitlab.com/inkscape/lib2geom/-/issues/63 "elliptical-arc-test" - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + # Fails due to rounding differences + # https://gitlab.com/inkscape/lib2geom/-/issues/70 + "circle-test" + ] + ; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' |