diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2024-05-05 10:59:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-05 10:59:14 -0400 |
| commit | 8c429107e982d4debdb67f2c3e3402a23a308f05 (patch) | |
| tree | 488d42694d1a3f2fa9d078ed8e8e4284ee487d10 | |
| parent | 5c1ff7d66cd746f036d5a4a218e5b36009858525 (diff) | |
| parent | a14bae871adf63b2ff4dcc391e9f42f495458ae4 (diff) | |
Merge pull request #309165 from reckenrode/lldb-fix
| -rw-r--r-- | pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/common/lldb.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 70f4cbd833deb..8ed7c0b946b40 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -67,7 +67,7 @@ let cp $out/lib/* $out/share/adapter cp -r adapter/scripts $out/share/adapter cp -t $out/share/formatters formatters/*.py - ln -s ${lldb.lib} $out/share/lldb + ln -s ${lib.getLib lldb} $out/share/lldb makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" ''; diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 59e427e846c46..c582ac8639411 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation (rec { src = src'; inherit patches; - outputs = [ "out" "lib" "dev" ]; + # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of + # the `lib` output because that would create a cycle between it and the `out` output. + outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; |