From 17acba4cd1bb63c174b48a0b7bedb103f08e1eba Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 19 Oct 2023 15:48:42 +0300 Subject: [PATCH] stdenvAdapters.useMoldLinker: set `allowedRequisites` to `null` --- pkgs/stdenv/adapters.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1024bf2ce4d8..f7d7053c77a9 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: {