diff options
| author | Maxim Krivchikov <maxim.krivchikov@gmail.com> | 2020-09-11 00:38:29 +0300 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:31 +0000 |
| commit | be6011bb9285c0f09f66ffaff0ada5c871425739 (patch) | |
| tree | a5809d727fe90177b81498cb34139d6e47565d7e /nixpkgs/pkgs/development/compilers | |
| parent | 15785a8ee270ef73d3bdfe80ad1a1541524889b3 (diff) | |
| download | nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.tar nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.tar.gz nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.tar.bz2 nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.tar.lz nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.tar.xz nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.tar.zst nixlib-be6011bb9285c0f09f66ffaff0ada5c871425739.zip | |
lldb_5, lldb_6: add patch for >=python-3.7
(cherry picked from commit 172f3a197e38c885bc5a183ecb12b47081d78819)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix index e0698e1dcf3d..e827f76231f1 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix index 80e298eaf8c0..629749e10f3c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix +++ b/nixpkgs/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",' \ |