diff options
| author | Pavel Sobolev <paveloom@riseup.net> | 2023-10-19 15:48:42 +0300 |
|---|---|---|
| committer | Pavel Sobolev <paveloom@riseup.net> | 2023-10-19 15:48:42 +0300 |
| commit | 17acba4cd1bb63c174b48a0b7bedb103f08e1eba (patch) | |
| tree | 4dd3267a3f9fe16948be68010679ff8c44b6050d /pkgs/stdenv/adapters.nix | |
| parent | bff80fa4b4f1f795e5da8833ff424d95628252ff (diff) | |
| download | nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.tar nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.tar.gz nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.tar.bz2 nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.tar.lz nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.tar.xz nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.tar.zst nixpkgs-17acba4cd1bb63c174b48a0b7bedb103f08e1eba.zip | |
stdenvAdapters.useMoldLinker: set `allowedRequisites` to `null`
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: { |