public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjpeg-turbo: specify djpeg rgb-islow-icc-cmp test dependencies 

Hydra failure: https://hydra.nixos.org/build/87096374/nixlog/1

Upstream issue: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
This commit is contained in:
Orivej Desh 2019-01-12 07:34:46 +00:00
parent c4a5565e7a
commit c55a42359a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch ./mingw-boolean.patch
++ [ ++ [
./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
(fetchpatch { (fetchpatch {
name = "cve-2018-19664.diff"; name = "cve-2018-19664.diff";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";

11
pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES})
add_test(djpeg-${libtype}-rgb-islow-icc-cmp
${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc)
+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES
+ DEPENDS djpeg-${libtype}-rgb-islow)
add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc"
testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2})