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

libpng default: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:21:38 -04:00 committed by John Ericson
parent bdbdb08eef
commit a850ddbefc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
{ stdenv, fetchurl, zlib, apngSupport ? true }: { stdenv, fetchurl, zlib, apngSupport ? true
, buildPlatform, hostPlatform
}:
assert zlib != null; assert zlib != null;
@ -29,7 +31,7 @@ in stdenv.mkDerivation rec {
# it's hard to cross-run tests and some check programs didn't compile anyway # it's hard to cross-run tests and some check programs didn't compile anyway
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
doCheck = ! stdenv ? cross; doCheck = hostPlatform == buildPlatform;
passthru = { inherit zlib; }; passthru = { inherit zlib; };