diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
| commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
| tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/libjpeg-turbo | |
| parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
| parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
| download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip | |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libjpeg-turbo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 23fa2f44b46f..57c35ab86777 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/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/; |