mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Code Issues Wiki Activity

Merge #291106: opencolorio: fix tests on staging-next

Browse source
This commit is contained in:
Vladimír Čunát 2024-02-24 11:46:34 +01:00
parent 7d52ac6d83 2b0673c217
commit e9dcfb33c4
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/opencolorio/default.nix
View file

@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200.
# Needed for zlib >= 1.3 && cmake < 3.27.4.
./broken-cmake-zlib-version.patch
# Fix incorrect line number in test
./line-numbers.patch
];
postPatch = lib.optionalString stdenv.isDarwin ''

13
pkgs/development/libraries/opencolorio/line-numbers.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp
index 7a7ab67b..18c1f55e 100644
--- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp
+++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp
@@ -1416,7 +1416,7 @@ OCIO_ADD_TEST(FileFormatCTF, difficult_xml_unknown_elements)
"(37): Unrecognized element 'just_ignore' where its parent is 'ProcessList' (8): Unknown element",
"(69): Unrecognized element 'just_ignore' where its parent is 'Description' (66)",
"(70): Unrecognized element 'just_ignore' where its parent is 'just_ignore' (69)",
- "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (43): 'Matrix' not allowed in this element",
+ "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (46): 'Matrix' not allowed in this element",
"(76): Unrecognized element 'Description' where its parent is 'Matrix' (75)",
"(77): Unrecognized element 'Array' where its parent is 'Matrix' (75)"
};