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/adapters.nix | |
| parent | 7610f0417b2f3c42f99ff1f30f8224007fb31a20 (diff) | |
| download | nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.tar nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.tar.gz nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.tar.bz2 nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.tar.lz nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.tar.xz nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.tar.zst nixlib-0de6275003170cb82e5f9a3bdfb649ff22b8b12a.zip | |
pkgsStatic: fix eval on Darwin
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 4 |
1 files changed, 2 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 ]; }); |