diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:20:55 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 19:37:39 -0400 |
| commit | bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867 (patch) | |
| tree | 6860af6a938e8c421136019966284f051dd29278 /pkgs/development/libraries/libpng | |
| parent | a9c90df12ef0d462e42363e9613d7517ae333e53 (diff) | |
| download | nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.tar nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.tar.gz nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.tar.bz2 nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.tar.lz nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.tar.xz nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.tar.zst nixlib-bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867.zip | |
libpng 12: Don't use stdenv ? cross
Diffstat (limited to 'pkgs/development/libraries/libpng')
| -rw-r--r-- | pkgs/development/libraries/libpng/12.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index b3f7f96e9362..457f99ef13bd 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib +, buildPlatform, hostPlatform +}: -assert !(stdenv ? cross) -> zlib != null; +assert hostPlatform == buildPlatform -> zlib != null; stdenv.mkDerivation rec { name = "libpng-1.2.57"; @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { passthru = { inherit zlib; }; - crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { + crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") { propagatedBuildInputs = []; passthru = {}; }; |