cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #58374: libjpeg-turbo: 2.0.1 -> 2.0.2, cleanup

Browse source 
... into staging
This commit is contained in:
Vladimír Čunát 2019-05-08 14:32:23 +02:00
commit c298a8a800
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pkgs/development/libraries/libjpeg-turbo/default.nix
View file

@ -1,47 +1,26 @@
{ stdenv, fetchurl, fetchpatch, cmake, nasm }: { stdenv, fetchurl, fetchpatch, cmake, nasm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}"; pname = "libjpeg-turbo";
version = "2.0.1"; version = "2.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"; sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c";
}; };
patches = patches =
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 {
name = "cve-2018-19664.diff";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";
sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5";
})
(fetchpatch {
name = "CVE-2018-20330.patch";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff";
sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji";
})
];
outputs = [ "bin" "dev" "out" "man" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ cmake nasm ]; nativeBuildInputs = [ cmake nasm ];
preConfigure = '' cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ];
cmakeFlagsArray+=(
"-DCMAKE_INSTALL_BINDIR=$bin/bin"
"-DENABLE_STATIC=0"
)
'';
doCheck = true; # not cross; doInstallCheck = true;
checkTarget = "test"; installCheckTarget = "test";
preCheck = ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://libjpeg-turbo.virtualgl.org/; homepage = http://libjpeg-turbo.virtualgl.org/;