diff options
author | Artturi <Artturin@artturin.com> | 2023-06-20 16:43:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-20 16:43:41 +0300 |
commit | 289d9cf8a7d58086328e78cfc29b267596a0a2de (patch) | |
tree | 3cacacf2fe3bd6f5b6c2481c7ab2b80837cf5032 /pkgs/development/compilers/llvm/12/default.nix | |
parent | 2fd2dc90b0344da41ddc83c31e032fae3141832a (diff) | |
parent | d53d5a8b38f8ecbf75388a1582efd4c19e61d5da (diff) | |
download | nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.tar nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.tar.gz nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.tar.bz2 nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.tar.lz nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.tar.xz nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.tar.zst nixlib-289d9cf8a7d58086328e78cfc29b267596a0a2de.zip |
Merge pull request #230387 from Artturin/llvmsplit1
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 |