From f9de5019a8b843e4d4ffb8e447525d669c3ebb5f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 29 Mar 2025 22:33:59 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.clang: move pname --- .../compilers/llvm/common/clang/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 1c07899d591f..7004c56065d3 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -21,22 +21,21 @@ }: let - pname = "clang"; - self = stdenv.mkDerivation (finalAttrs: rec { - inherit pname version; + pname = "clang"; + inherit version; src = if monorepoSrc != null then - runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } ('' + runCommand "clang-src-${version}" { inherit (monorepoSrc) passthru; } ('' mkdir -p "$out" '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" '' + '' - cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/clang "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" '') else src; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = "${src.name}/clang"; patches = [