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

libjxl: fix/enable for aarch64

Browse Source
This commit is contained in:
Robert Scott 2021-12-12 16:16:08 +00:00
parent 1b5dc1a188
commit f24cab5396
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libjxl/default.nix
View File

@ -39,9 +39,14 @@ stdenv.mkDerivation rec {
}) })
]; ];
# hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 postPatch = ''
# unless we disable highway's tests # "robust statistics" have been removed in upstream mainline as they are
postPatch = lib.optional stdenv.isDarwin '' # conidered to cause "interoperability problems". sure enough the tests
# fail with precision issues on aarch64.
sed -i '/robust_statistics_test.cc/d' lib/{jxl_tests.cmake,lib.gni}
'' + lib.optionalString stdenv.isDarwin ''
# hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408
# unless we disable highway's tests
substituteInPlace third_party/highway/CMakeLists.txt \ substituteInPlace third_party/highway/CMakeLists.txt \
--replace 'if(BUILD_TESTING)' 'if(false)' --replace 'if(BUILD_TESTING)' 'if(false)'
''; '';
@ -118,6 +123,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ nh2 ]; maintainers = with maintainers; [ nh2 ];
platforms = platforms.all; platforms = platforms.all;
broken = stdenv.hostPlatform.isAarch64; # `internal compiler error`, see https://github.com/NixOS/nixpkgs/pull/103160#issuecomment-866388610
}; };
} }