From 48db49741e6e93571a0571b5887b9c99d5b9f513 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 12 Jan 2019 07:34:46 +0000 Subject: [PATCH] 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 (cherry picked from commit c55a42359a51d5802356923adc07c622e4eb6c2e) --- pkgs/development/libraries/libjpeg-turbo/default.nix | 1 + .../libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 14b01cd9a8433e2..89763f489f0b5e4 100644 --- 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 new file mode 100644 index 000000000000000..c0f7fef449385a6 --- /dev/null +++ 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})