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

Hydra failure: https://hydra.nixos.org/build/87096374/nixlog/1 Upstream issue: libjpeg-turbo/libjpeg-turbo#321 (cherry picked from commit c55a423)
NixOS · Jan 12, 2019 · 48db497 · 48db497
1 parent 634191a
commit 48db497
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
       ./mingw-boolean.patch
   ++ [
+    ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
     (fetchpatch {
       name = "cve-2018-19664.diff";
       url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";

diff --git a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch
@@ -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})