From cc7740ae770c52ac1f385aa25cfc143fe79c6b6e Mon Sep 17 00:00:00 2001
From: tcmal <oscar.shrimpton.personal@gmail.com>
Date: Wed, 9 Jun 2021 16:09:29 +0100
Subject: lldb: python into lib & wrap binary

---
 pkgs/development/compilers/llvm/9/lldb/default.nix          |  7 +++++--
 .../compilers/llvm/9/lldb/gnu-install-dirs.patch            | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/compilers/llvm/9/lldb')

diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix
index ee42e391b58..63edc60828e 100644
--- a/pkgs/development/compilers/llvm/9/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/9/lldb/default.nix
@@ -12,6 +12,7 @@
 , python3
 , version
 , darwin
+, makeWrapper
 , lit
 }:
 
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [
-    cmake python3 which swig lit
+    cmake python3 which swig lit makeWrapper
   ];
 
   buildInputs = [
@@ -59,12 +60,14 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   installCheckPhase = ''
-    if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then
+    if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
         return 1;
     fi
   '';
 
   postInstall = ''
+    wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
+
     # man page
     mkdir -p $out/share/man/man1
     install ../docs/lldb.1 -t $out/share/man/man1/
diff --git a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch
index a482aac5779..7876220e4d3 100644
--- a/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch
+++ b/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch
@@ -76,3 +76,16 @@ index cdf22c4..d56fc6a 100644
                 ${use_python_wrapper_from_src_dir}
                 ${use_six_py_from_system}
          VERBATIM
+diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
+index b726797..1f057ac 100644
+--- a/cmake/modules/LLDBStandalone.cmake
++++ b/cmake/modules/LLDBStandalone.cmake
+@@ -95,7 +95,7 @@ include_directories(
+   "${CLANG_INCLUDE_DIRS}")
+
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX})
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
+
+ set(LLDB_BUILT_STANDALONE 1)
-- 
cgit 1.4.1