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

libpng: cleanup tests

Browse Source
This commit is contained in:
Jan Malakhovski 2018-08-08 19:17:47 +00:00
parent 2781c7d312
commit ee90a2d893
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libpng/default.nix
View File

@ -3,9 +3,7 @@
assert zlib != null; assert zlib != null;
let let
version = "1.6.34";
patchVersion = "1.6.34"; patchVersion = "1.6.34";
sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
patch_src = fetchurl { patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6"; sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
@ -14,10 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}"; name = "libpng" + whenPatched "-apng" + "-${version}";
version = "1.6.34";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
inherit sha256; sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
}; };
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
@ -26,9 +25,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
# it's hard to cross-run tests and some check programs didn't compile anyway doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
doCheck = true; # not cross;
passthru = { inherit zlib; }; passthru = { inherit zlib; };