From ad1cf9ab776b925698e472a6c5a7424138f9bc63 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 24 Jul 2024 20:22:34 +0200 Subject: [PATCH] Switch to latest LLVM --- stdenv.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stdenv.nix b/stdenv.nix index 4bd8f79..032fcf4 100644 --- a/stdenv.nix +++ b/stdenv.nix @@ -1,7 +1,8 @@ pkgs: stdenv: let + inherit (pkgs) addAttrsToDerivation overrideCC; inherit (pkgs.lib) optionalAttrs optionals toList; - inherit (pkgs) addAttrsToDerivation; + inherit (pkgs.llvmPackages_latest) clangUseLLVM; inherit (stdenv) buildPlatform hostPlatform; cflagsC = [ @@ -50,4 +51,4 @@ in addAttrsToDerivation (base: { NIX_CFLAGS_LINK = toList base.NIX_CFLAGS_LINK or [ ] ++ cflagsL; } // optionalAttrs (!base ? env.NIX_LDFLAGS) { NIX_LDFLAGS = toList base.NIX_LDFLAGS or [ ] ++ ldflags; -}) stdenv +}) (overrideCC stdenv clangUseLLVM)