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

libjpeg_turbo: fix race in tests

Browse Source 
Fixes:

12/151 Test  #46: jpegtran-shared-icc ...............................***Failed    0.03 sec
Premature end of JPEG file
JPEG datastream contains no image

63/151 Test  #47: jpegtran-shared-icc-cmp ...........................***Failed    0.12 sec
Could not obtain MD5 sum: No such file or directory

The following tests FAILED:
         46 - jpegtran-shared-icc (Failed)
         47 - jpegtran-shared-icc-cmp (Failed)

Example build: https://hydra.nixos.org/build/117594627
This commit is contained in:
Andrew Childs 2020-05-02 16:00:09 +09:00
parent 1a9c35d051
commit 969ae819f9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, nasm, enableStatic ? false }: { stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
}; };
patches = patches =
[
# Fixes race in tests that causes "jpegtran-shared-icc" to fail
# https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425
(fetchpatch {
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch";
sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym";
})
] ++
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch; ./mingw-boolean.patch;