From b97d4a3efb13753aa7f4b620f7ef3ee5d62f071f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 25 Aug 2023 00:01:12 +0700 Subject: [PATCH] packages/linux-lava: fix build by adding lld --- packages/linux-lava/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index fba638a..266ddde 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -1,10 +1,11 @@ { buildLinux , callPackage , ccacheStdenv -, clangStdenv , inputs , kernelPatches , lib +, llvmPackages +, overrideCC , ... } @ args: @@ -12,7 +13,10 @@ let sources = callPackage ./sources.nix { inherit inputs; }; in buildLinux (args // { inherit (sources) src kernelPatches; - stdenv = ccacheStdenv.override { stdenv = clangStdenv; }; + stdenv = ccacheStdenv.override { + # :sob: see https://github.com/NixOS/nixpkgs/issues/142901 + stdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { inherit (llvmPackages) bintools; }); + }; version = "${sources.version}-tkg-Lava"; isZen = true; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ];