diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-08-08 13:55:23 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-08-08 19:19:41 +0200 |
| commit | a6defaf953d4470a9dcf8cae3bef1c2c4d17f296 (patch) | |
| tree | 084a65f2a8029f86997974205f8fb81ea79a77c6 | |
| parent | 6a1354b1fc14dfd549bd88f58aede0178f489415 (diff) | |
| download | nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.tar nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.tar.gz nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.tar.bz2 nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.tar.lz nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.tar.xz nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.tar.zst nixpkgs-a6defaf953d4470a9dcf8cae3bef1c2c4d17f296.zip | |
llvmPackages_13.lldb: fix python lldb library
Ported from e097f7efc77726a17acca7be3e6e2346331883f3.
| -rw-r--r-- | pkgs/development/compilers/llvm/13/lldb/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch | 13 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index 2dd6c46eb82..63a5c828faa 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$out/lib/python3.8/site-packages/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' # Editor support # vscode: diff --git a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch index 98321f4479e..0435784a247 100644 --- a/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch @@ -63,3 +63,16 @@ index 734167e51bc5..f95761b5df58 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file |