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

Merge #50249: libjpeg-turbo: 1.5.3 -> 2.0.1

Browse Source 
(into staging)
This commit is contained in:
Vladimír Čunát 2018-11-28 10:23:33 +01:00
commit 834e7c4f0b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,13 @@
{ stdenv, fetchurl, nasm { stdenv, fetchurl, cmake, nasm }:
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}"; name = "libjpeg-turbo-${version}";
version = "1.5.3"; version = "2.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j"; sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
}; # github releases still need autotools, surprisingly };
patches = patches =
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
@ -16,12 +15,20 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ]; 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; doCheck = true; # not cross;
checkTarget = "test"; checkTarget = "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/;