pyrox.dev / nixpkgs
lol
fork atom

llvmPackages_{14,15,16,17,git}.lldb: unify lua and python path patch

authored by

Semion Nadezhdin and committed by
sternenseemann 622a03c1 93fdb2d0

+5 -97
+1 -1
pkgs/development/compilers/llvm/14/default.nix
··· 158 158 [ 159 159 ./lldb/procfs.patch 160 160 resourceDirPatch 161 - ./lldb/gnu-install-dirs.patch 161 + ../common/lldb/gnu-install-dirs.patch 162 162 ] 163 163 # This is a stopgap solution if/until the macOS SDK used for x86_64 is 164 164 # updated.
pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/15/default.nix
··· 157 157 [ 158 158 ./lldb/procfs.patch 159 159 resourceDirPatch 160 - ./lldb/gnu-install-dirs.patch 160 + ../common/lldb/gnu-install-dirs.patch 161 161 ] 162 162 # This is a stopgap solution if/until the macOS SDK used for x86_64 is 163 163 # updated.
-23
pkgs/development/compilers/llvm/15/lldb/gnu-install-dirs.patch
··· 1 - diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 2 - index 3291a7c808e1..b27d27ce6a87 100644 3 - --- a/cmake/modules/AddLLDB.cmake 4 - +++ b/cmake/modules/AddLLDB.cmake 5 - @@ -109,7 +109,7 @@ function(add_lldb_library name) 6 - endif() 7 - 8 - if(PARAM_SHARED) 9 - - set(install_dest lib${LLVM_LIBDIR_SUFFIX}) 10 - + set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 11 - if(PARAM_INSTALL_PREFIX) 12 - set(install_dest ${PARAM_INSTALL_PREFIX}) 13 - endif() 14 - diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt 15 - index 7d48491ec89a..c04543585588 100644 16 - --- a/tools/intel-features/CMakeLists.txt 17 - +++ b/tools/intel-features/CMakeLists.txt 18 - @@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED 19 - ) 20 - 21 - install(TARGETS lldbIntelFeatures 22 - - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 23 - + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+1 -1
pkgs/development/compilers/llvm/16/default.nix
··· 162 162 [ 163 163 # FIXME: do we need this? ./procfs.patch 164 164 resourceDirPatch 165 - ./lldb/gnu-install-dirs.patch 165 + ../common/lldb/gnu-install-dirs.patch 166 166 ] 167 167 # This is a stopgap solution if/until the macOS SDK used for x86_64 is 168 168 # updated.
-23
pkgs/development/compilers/llvm/16/lldb/gnu-install-dirs.patch
··· 1 - diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 2 - index 3291a7c808e1..b27d27ce6a87 100644 3 - --- a/cmake/modules/AddLLDB.cmake 4 - +++ b/cmake/modules/AddLLDB.cmake 5 - @@ -109,7 +109,7 @@ function(add_lldb_library name) 6 - endif() 7 - 8 - if(PARAM_SHARED) 9 - - set(install_dest lib${LLVM_LIBDIR_SUFFIX}) 10 - + set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 11 - if(PARAM_INSTALL_PREFIX) 12 - set(install_dest ${PARAM_INSTALL_PREFIX}) 13 - endif() 14 - diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt 15 - index 7d48491ec89a..c04543585588 100644 16 - --- a/tools/intel-features/CMakeLists.txt 17 - +++ b/tools/intel-features/CMakeLists.txt 18 - @@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED 19 - ) 20 - 21 - install(TARGETS lldbIntelFeatures 22 - - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 23 - + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+1 -1
pkgs/development/compilers/llvm/17/default.nix
··· 153 153 patches = 154 154 [ 155 155 # FIXME: do we need this? ./procfs.patch 156 - ./lldb/gnu-install-dirs.patch 156 + ../common/lldb/gnu-install-dirs.patch 157 157 ] 158 158 # This is a stopgap solution if/until the macOS SDK used for x86_64 is 159 159 # updated.
-23
pkgs/development/compilers/llvm/17/lldb/gnu-install-dirs.patch
··· 1 - diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 2 - index 3291a7c808e1..b27d27ce6a87 100644 3 - --- a/cmake/modules/AddLLDB.cmake 4 - +++ b/cmake/modules/AddLLDB.cmake 5 - @@ -109,7 +109,7 @@ function(add_lldb_library name) 6 - endif() 7 - 8 - if(PARAM_SHARED) 9 - - set(install_dest lib${LLVM_LIBDIR_SUFFIX}) 10 - + set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 11 - if(PARAM_INSTALL_PREFIX) 12 - set(install_dest ${PARAM_INSTALL_PREFIX}) 13 - endif() 14 - diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt 15 - index 7d48491ec89a..c04543585588 100644 16 - --- a/tools/intel-features/CMakeLists.txt 17 - +++ b/tools/intel-features/CMakeLists.txt 18 - @@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED 19 - ) 20 - 21 - install(TARGETS lldbIntelFeatures 22 - - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 23 - + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+1 -1
pkgs/development/compilers/llvm/git/default.nix
··· 158 158 patches = 159 159 [ 160 160 # FIXME: do we need this? ./procfs.patch 161 - ./lldb/gnu-install-dirs.patch 161 + ../common/lldb/gnu-install-dirs.patch 162 162 ] 163 163 # This is a stopgap solution if/until the macOS SDK used for x86_64 is 164 164 # updated.
-23
pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch
··· 1 - diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 2 - index 3291a7c808e1..b27d27ce6a87 100644 3 - --- a/cmake/modules/AddLLDB.cmake 4 - +++ b/cmake/modules/AddLLDB.cmake 5 - @@ -109,7 +109,7 @@ function(add_lldb_library name) 6 - endif() 7 - 8 - if(PARAM_SHARED) 9 - - set(install_dest lib${LLVM_LIBDIR_SUFFIX}) 10 - + set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 11 - if(PARAM_INSTALL_PREFIX) 12 - set(install_dest ${PARAM_INSTALL_PREFIX}) 13 - endif() 14 - diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt 15 - index 7d48491ec89a..c04543585588 100644 16 - --- a/tools/intel-features/CMakeLists.txt 17 - +++ b/tools/intel-features/CMakeLists.txt 18 - @@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED 19 - ) 20 - 21 - install(TARGETS lldbIntelFeatures 22 - - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 23 - + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})