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 }:
2
3
-
assert !(stdenv ? cross) -> zlib != null;
4
5
stdenv.mkDerivation rec {
6
name = "libpng-1.2.57";
···
16
17
passthru = { inherit zlib; };
18
19
-
crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
20
propagatedBuildInputs = [];
21
passthru = {};
22
};
···
1
+
{ stdenv, fetchurl, zlib
2
+
, buildPlatform, hostPlatform
3
+
}:
4
5
+
assert hostPlatform == buildPlatform -> zlib != null;
6
7
stdenv.mkDerivation rec {
8
name = "libpng-1.2.57";
···
18
19
passthru = { inherit zlib; };
20
21
+
crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") {
22
propagatedBuildInputs = [];
23
passthru = {};
24
};