diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-08-11 16:34:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-11 16:34:22 +0000 |
commit | a68e5e918e52f1b45a13c585f6b015a254e94f18 (patch) | |
tree | 6e825fe861796e75ddf87da42d3f63c4c4889b88 /pkgs/development/libraries/libpng/default.nix | |
parent | b9c8d68452aca58f4588788b78ec2e255f5b6192 (diff) | |
parent | 35c9435d15b31bdfc000d67670b7ac58dca30c4e (diff) | |
download | nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.tar nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.tar.gz nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.tar.bz2 nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.tar.lz nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.tar.xz nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.tar.zst nixlib-a68e5e918e52f1b45a13c585f6b015a254e94f18.zip |
Merge pull request #44825 from oxij/docheck/continues-in-a-big-way
treewide: enable working, fix fixable, disable broken tests
Diffstat (limited to 'pkgs/development/libraries/libpng/default.nix')
-rw-r--r-- | pkgs/development/libraries/libpng/default.nix | 9 |
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; }; |