Skip to content

Commit

Permalink
Merge #50249: libjpeg-turbo: 1.5.3 -> 2.0.1
Browse files Browse the repository at this point in the history
(cherry picked from commit 834e7c4)
Fixes CVE-2018-11813.
I see no issues with this reported for staging/master.
  • Loading branch information
vcunat committed Dec 21, 2018
1 parent ea9cfed commit bdf88aa
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions pkgs/development/libraries/libjpeg-turbo/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
{ stdenv, fetchurl, nasm
}:
{ stdenv, fetchurl, cmake, nasm }:

stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}";
version = "1.5.3";
version = "2.0.1";

src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j";
}; # github releases still need autotools, surprisingly
sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
};

patches =
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch;

outputs = [ "bin" "dev" "out" "man" "doc" ];

nativeBuildInputs = [ nasm ];
nativeBuildInputs = [ cmake nasm ];

enableParallelBuilding = true;
preConfigure = ''
cmakeFlagsArray+=(
"-DCMAKE_INSTALL_BINDIR=$bin/bin"
"-DENABLE_STATIC=0"
)
'';

doCheck = true; # not cross;
checkTarget = "test";
preCheck = ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH"
'';

meta = with stdenv.lib; {
homepage = http://libjpeg-turbo.virtualgl.org/;
Expand Down

0 comments on commit bdf88aa

Please sign in to comment.