diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/12/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/12/default.nix | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index 593db716ac6b..a6d68d2e2a44 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -8,7 +8,7 @@ let release_version = "12.0.0"; - candidate = "rc5"; # empty or "rcN" + candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; @@ -18,7 +18,13 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1hga9k5m60ywmr7m69jf1v6vj1ra1n6ybv1abzlz94f5q22i1a02"; + clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd"; + + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); @@ -30,13 +36,16 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + in { - llvm = callPackage ./llvm.nix { }; + llvm = callPackage ./llvm { + inherit llvm_meta; + }; clang-unwrapped = callPackage ./clang { inherit (tools) lld; - inherit clang-tools-extra_src; + inherit clang-tools-extra_src llvm_meta; }; # disabled until recommonmark supports sphinx 3 @@ -80,11 +89,13 @@ let extraBuildCommands = mkExtraBuildCommands cc; }; - lld = callPackage ./lld.nix { + lld = callPackage ./lld { + inherit llvm_meta; libunwind = libraries.libunwind; }; - lldb = callPackage ./lldb.nix { + lldb = callPackage ./lldb { + inherit llvm_meta; inherit (darwin) libobjc bootstrap_cmds; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; @@ -97,7 +108,7 @@ let # doesn’t support like LLVM. Probably we should move to some other # file. - bintools = callPackage ./bintools.nix {}; + bintools = callPackage ./bintools {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; @@ -172,7 +183,7 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt.nix ({} // + compiler-rt = callPackage ./compiler-rt ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -181,20 +192,20 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ ({} // + libcxx = callPackage ./libcxx ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); - libcxxabi = callPackage ./libc++abi.nix ({} // + libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); - openmp = callPackage ./openmp.nix {}; + openmp = callPackage ./openmp { inherit llvm_meta; }; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); |