diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-20 18:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 18:01:51 +0000 |
| commit | 8b9041779d570adb5de8b3fae57c0dfcdb1fd920 (patch) | |
| tree | a1714d14676a0e9fd600522d5c4c284964d0d916 /pkgs/development/compilers/llvm/12/default.nix | |
| parent | 62f759132d9d3554415929dab2a3c2c95ddbf70b (diff) | |
| parent | a102ec2394bbcb85ab1aaf3926c15b8c9de48d37 (diff) | |
| download | nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.tar nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.tar.gz nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.tar.bz2 nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.tar.lz nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.tar.xz nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.tar.zst nixlib-8b9041779d570adb5de8b3fae57c0dfcdb1fd920.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/llvm/12/default.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/12/default.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 512a576d6f5d..d7fa0517815c 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -135,11 +135,23 @@ let inherit (libraries) libunwind; }; - 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; + lldb = callPackage ../common/lldb.nix { + src = fetch "lldb" "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78"; + patches = + let + resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch" + { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./lldb/resource-dir.patch}' "$out" --subst-var clangLibDir + '')) { }; + in + [ + ./lldb/procfs.patch + resourceDirPatch + ./lldb/gnu-install-dirs.patch + ]; + inherit llvm_meta release_version; }; # Below, is the LLVM bootstrapping logic. It handles building a |