diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-20 06:35:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 06:35:22 +0000 |
| commit | 34db746ff9f9afef1fe5e2c2809807f79a3732fb (patch) | |
| tree | 6fbad7d4536a9a51789d1fc2e40e940b4ad3bda9 /pkgs/stdenv/adapters.nix | |
| parent | cad1b2525d506ce75b9e3de3343a63722f2063e9 (diff) | |
| parent | 3342d1a9a985e9f1456ebdab9fde2514c1716341 (diff) | |
| download | nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.gz nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.bz2 nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.lz nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.xz nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.zst nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 05aaaea4f10..7c64fd7e392 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -198,16 +198,10 @@ rec { ''; }; in stdenv.override (old: { - cc = stdenv.cc.override { - inherit bintools; - }; - allowedRequisites = - (lib.optional (stdenv.allowedRequisites or null != null) stdenv.allowedRequisites) - ++ [ bintools pkgs.mold ] - # need to `outputSpecified = false` to make getLib work - ++ (builtins.map (p: lib.getLib (p // { outputSpecified = false; })) pkgs.mold.buildInputs); - # gcc >12.1.0 supports '-fuse-ld=mold' - # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 + allowedRequisites = null; + cc = stdenv.cc.override { inherit bintools; }; + # gcc >12.1.0 supports '-fuse-ld=mold' + # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 # https://github.com/rui314/mold#how-to-use } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { |