diff options
| author | Artturin <Artturin@artturin.com> | 2023-10-20 09:29:36 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-10-20 09:29:36 +0300 |
| commit | 3342d1a9a985e9f1456ebdab9fde2514c1716341 (patch) | |
| tree | 8e0544fd01cb188b3757e4c97a5d73539a45610b /pkgs/stdenv/adapters.nix | |
| parent | 0bcaa2f556ace563a74ef93125c439a01d4f8dec (diff) | |
| parent | 5bf82c5a0be600bf8129bc27977205e0806e5a8b (diff) | |
| download | nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.tar nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.tar.gz nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.tar.bz2 nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.tar.lz nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.tar.xz nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.tar.zst nixpkgs-3342d1a9a985e9f1456ebdab9fde2514c1716341.zip | |
Merge branch 'master' into staging-next
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 1024bf2ce4d..f7d7053c77a 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -197,16 +197,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: { |