cross stdenv: Forget allowedRequisites = nulll;
on inline
This commit is contained in:
parent
5dabbf4273
commit
87357fc39c
|
@ -43,6 +43,7 @@ in lib.init bootStages ++ [
|
||||||
# a different platform, and so are disabled.
|
# a different platform, and so are disabled.
|
||||||
overrides = _: _: {};
|
overrides = _: _: {};
|
||||||
extraBuildInputs = [ ]; # Old ones run on wrong platform
|
extraBuildInputs = [ ]; # Old ones run on wrong platform
|
||||||
|
allowedRequisites = null;
|
||||||
|
|
||||||
cc = if crossSystem.useiOSPrebuilt or false
|
cc = if crossSystem.useiOSPrebuilt or false
|
||||||
then buildPackages.darwin.iosSdkPkgs.clang
|
then buildPackages.darwin.iosSdkPkgs.clang
|
||||||
|
|
|
@ -34,7 +34,8 @@ with pkgs;
|
||||||
extraPackages = [];
|
extraPackages = [];
|
||||||
inherit bintools;
|
inherit bintools;
|
||||||
};
|
};
|
||||||
allowedRequisites = stdenv.allowedRequisites ++ [ bintools ];
|
allowedRequisites =
|
||||||
|
lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null);
|
||||||
};
|
};
|
||||||
|
|
||||||
# For convenience, allow callers to get the path to Nixpkgs.
|
# For convenience, allow callers to get the path to Nixpkgs.
|
||||||
|
|
Loading…
Reference in a new issue