aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/libpng
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-08-08 19:17:47 +0000
committerJan Malakhovski <oxij@oxij.org>2018-08-10 12:56:34 +0000
commitee90a2d893801c35fa5d071a1905544c21edbdfe (patch)
tree08c58cc38e1bbc7565328fd0bb5731678d23832c /pkgs/development/libraries/libpng
parent2781c7d312edf285f56c13266bfebf7690cbec76 (diff)
libpng: cleanup tests
Diffstat (limited to 'pkgs/development/libraries/libpng')
-rw-r--r--pkgs/development/libraries/libpng/default.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 4173588ac522..0e5a4a866e8f 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,9 +3,7 @@
assert zlib != null;
let
- version = "1.6.34";
patchVersion = "1.6.34";
- sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
@@ -14,10 +12,11 @@ let
in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}";
+ version = "1.6.34";
src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
- inherit sha256;
+ sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
};
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
@@ -26,9 +25,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib ];
- # it's hard to cross-run tests and some check programs didn't compile anyway
- makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
- doCheck = true; # not cross;
+ doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
passthru = { inherit zlib; };