diff options
| author | Robert Scott <code@humanleg.org.uk> | 2020-09-23 19:12:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 19:12:07 +0100 |
| commit | 189520cc63d3e46638c1e1f7a11386d9dacc2ce7 (patch) | |
| tree | 1429a3f338742f746d357f7454281a216f5722d7 | |
| parent | 9eb814f798fdb8c47b0def76d5796be0cef599fe (diff) | |
| parent | fc83817ba6c466fcb249b99d6d0dbe4b8475d367 (diff) | |
Merge pull request #98342 from maxxk/lldb5_6-python37-20.09
[20.09] lldb_5, lldb_6: add patch for >=python-3.7
| -rw-r--r-- | pkgs/development/compilers/llvm/5/lldb.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/6/lldb.nix | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index e0698e1dcf3dd..e827f76231f11 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 80e298eaf8c0c..629749e10f3c4 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ |