diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-03 03:12:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 03:12:35 +0100 |
| commit | d42bc1bafe74397063f84d819c17de48326c7c8d (patch) | |
| tree | 8468ba991f0bcb69eca06ee199e5ea3251067f6f /pkgs/applications | |
| parent | 43a55ee1cbf10baf58702915e305597859160b88 (diff) | |
| parent | 6afc8c26753f5b8219fe97d6a0c7f65af08102e8 (diff) | |
Merge pull request #275936 from wegank/lldb-14-patch-revert
lldb_14: fix broken bindings again
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix | 6 |
2 files changed, 0 insertions, 19 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch deleted file mode 100644 index e4ca6bb6299ed..0000000000000 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt -index 82a52da89a7e..5127dc1d8f41 100644 ---- a/bindings/python/CMakeLists.txt -+++ b/bindings/python/CMakeLists.txt -@@ -160,7 +160,7 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar - if(LLDB_BUILD_FRAMEWORK) - set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Python) - else() -- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH}) -+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}) - endif() - if (NOT CMAKE_CFG_INTDIR STREQUAL ".") - string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH}) diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix index a01e538f93e6d..1d0adf4d864da 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix @@ -13,12 +13,6 @@ in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { inherit llvmSrc; }; - patches = oldAttrs.patches ++ [ - # backport of https://github.com/NixOS/nixpkgs/commit/0d3002334850a819d1a5c8283c39f114af907cd4 - # remove when https://github.com/NixOS/nixpkgs/issues/166604 fixed - ./fix-python-installation.patch - ]; - doInstallCheck = true; # installCheck for lldb_14 currently broken |