diff options
| author | Jude Taylor <jude.taylor@dfinity.org> | 2020-04-28 07:51:39 -0700 |
|---|---|---|
| committer | Jude Taylor <jude.taylor@dfinity.org> | 2020-04-28 08:41:48 -0700 |
| commit | 0de6275003170cb82e5f9a3bdfb649ff22b8b12a (patch) | |
| tree | 777fe88588412df18621640e61529f219941c23c /pkgs/stdenv | |
| parent | 7610f0417b2f3c42f99ff1f30f8224007fb31a20 (diff) | |
pkgsStatic: fix eval on Darwin
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 cc49af7de3b5..5dbbdf778ea6 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; |