pyrox.dev
libpng 12: Don't use stdenv ? cross
authored by hsloan and committed by John Ericson bdbdb08e a9c90df1
+5
-3
pkgs/development/libraries/libpng/12.nix
+5
-3
pkgs/development/libraries/libpng/12.nix
···
1
-
{ stdenv, fetchurl, zlib }:
1
+
{ stdenv, fetchurl, zlib
2
+
, buildPlatform, hostPlatform
3
+
}:
2
4
3
-
assert !(stdenv ? cross) -> zlib != null;
5
+
assert hostPlatform == buildPlatform -> zlib != null;
4
6
5
7
stdenv.mkDerivation rec {
6
8
name = "libpng-1.2.57";
···
16
18
17
19
passthru = { inherit zlib; };
18
20
19
-
crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
21
+
crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") {
20
22
propagatedBuildInputs = [];
21
23
passthru = {};
22
24
};