From 3fce3b9d135b7ccd7672ee077bfc07f5b32fb0fb Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Mon, 25 Sep 2023 13:34:55 +0300 Subject: [PATCH] mold: use system libraries where possible --- pkgs/development/tools/mold/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 6c236fabd3f7..2cbc016a2933 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -6,7 +6,9 @@ , cmake , mimalloc , ninja +, tbb , zlib +, zstd , buildPackages , hello @@ -34,13 +36,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + tbb zlib + zstd ] ++ lib.optionals (!stdenv.isDarwin) [ mimalloc ]; cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" + "-DMOLD_USE_SYSTEM_TBB:BOOL=ON" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b37015321bcd..76ff983a5ad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19649,6 +19649,7 @@ with pkgs; mold = callPackage ../development/tools/mold { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_13.stdenv else stdenv; + tbb = tbb_2021_8; }; mold-wrapped = wrapBintoolsWith {