diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 789c5cd9d1d03..1942671a782b9 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -18,14 +18,19 @@ let pname = "libc"; - src' = runCommand "${pname}-src-${version}" { } '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/runtimes "$out" - cp -r ${monorepoSrc}/llvm "$out" - cp -r ${monorepoSrc}/compiler-rt "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; + src' = runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/runtimes "$out" + cp -r ${monorepoSrc}/llvm "$out" + cp -r ${monorepoSrc}/compiler-rt "$out" + cp -r ${monorepoSrc}/${pname} "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "21") '' + cp -r ${monorepoSrc}/third-party "$out" + '' + ); in stdenv.mkDerivation (finalAttrs: { inherit pname version patches; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 0a54afd1bf195..98f4c046e1477 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -32,7 +32,7 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; - "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q="; + "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY="; "22.0.0-git".gitRelease = { rev = "6afccac4148253d4f9a90ad0a51cba0995f92fad"; rev-version = "22.0.0-unstable-2025-10-19";