diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-18 08:17:48 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-18 08:17:48 +0200 |
| commit | 840e530934eb24f83788bb0933e304500ea0dc01 (patch) | |
| tree | b330ddaaaa66808ffe137eef0f48ce080d08bda9 /pkgs/development/libraries/libjpeg-turbo | |
| parent | 365c82c4bb80585d827ecde76b105075aba94040 (diff) | |
| parent | 2de2bc4be10637a7d8b11d40731954034ae3be57 (diff) | |
| download | nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.tar nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.tar.gz nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.tar.bz2 nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.tar.lz nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.tar.xz nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.tar.zst nixpkgs-840e530934eb24f83788bb0933e304500ea0dc01.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/libraries/libjpeg-turbo')
| -rw-r--r-- | pkgs/development/libraries/libjpeg-turbo/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 23fa2f44b46..57c35ab8677 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, fetchpatch, cmake, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-${version}"; + + pname = "libjpeg-turbo"; version = "2.0.2"; src = fetchurl { - url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"; }; @@ -17,18 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; - 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" - ''; + cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ]; + + doInstallCheck = true; + installCheckTarget = "test"; meta = with stdenv.lib; { homepage = http://libjpeg-turbo.virtualgl.org/; |