dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

stdenvAdapters.useMoldLinker: automatically add allowedRequisites

Browse Source 
Co-Authored-By: Pavel Sobolev <paveloom@riseup.net>
This commit is contained in:
Artturin 2023-10-03 08:36:22 +03:00 committed by Pavel Sobolev
parent 3fce3b9d13
commit e64d24fff4
No known key found for this signature in database
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/adapters.nix
View File

@ -201,7 +201,10 @@ rec {
inherit bintools;
};
allowedRequisites =
lib.mapNullable (rs: rs ++ [ bintools pkgs.mold (lib.getLib pkgs.mimalloc) (lib.getLib pkgs.openssl) ]) (stdenv.allowedRequisites or null);
(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
# https://github.com/rui314/mold#how-to-use