diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
| commit | 692d219a9312fbe3f8b34858a7ca0e32fb72bd07 (patch) | |
| tree | 4c0f5e46b2cf639e71acb43990697d769a969d2c /pkgs/stdenv | |
| parent | c1a0aa7eb73f86b0224a57671752673befe08953 (diff) | |
| parent | 82390e264704e4e1bf1652c9bebdc30a48f7fd07 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 8b23d3dadd2c..03ae3cb8f0e8 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -15,7 +15,7 @@ rec { # Used to override packages in stdenv like Make. Should not be used # for other dependencies. overrideInStdenv = stdenv: pkgs: - stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; }); + stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = (prev.extraBuildInputs or []) ++ pkgs; }); # Override the setup script of stdenv. Useful for testing new @@ -34,7 +34,7 @@ rec { makeStaticBinaries = stdenv: let stdenv' = if stdenv.hostPlatform.libc != "glibc" then stdenv else stdenv.override (prev: { - extraBuildInputs = prev.extraBuildInputs or [] ++ [ + extraBuildInputs = (prev.extraBuildInputs or []) ++ [ stdenv.glibc.static ]; }); diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 6ac03b7908fe..064e1836b17c 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -63,6 +63,8 @@ in lib.init bootStages ++ [ # `tryEval` wouldn't catch, wrecking accessing previous stages # when there is a C compiler and everything should be fine. then throw "no C compiler provided for this platform" + else if crossSystem.isDarwin + then buildPackages.llvmPackages.clang else if crossSystem.useLLVM or false then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; |