Skip to content

Commit d304789

Browse files
committed
vscode-extensions.vadimcn.vscode-lldb.adapter: fix LLDB_DEBUGSERVER_PATH for darwin
1 parent 6b31915 commit d304789

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix

+13-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
src,
1010
version,
1111
}:
12+
let
13+
# debugservers on macOS require the 'com.apple.security.cs.debugger'
14+
# entitlement which nixpkgs' lldb-server does not yet provide; see
15+
# <https://github.com/NixOS/nixpkgs/pull/38624> for details
16+
lldbServer =
17+
if stdenv.hostPlatform.isDarwin then
18+
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver"
19+
else
20+
"${lldb.out}/bin/lldb-server";
21+
in
1222
rustPlatform.buildRustPackage {
1323
pname = "${pname}-adapter";
1424
inherit version src;
@@ -43,11 +53,13 @@ rustPlatform.buildRustPackage {
4353
cp -t $out/share/formatters formatters/*.py
4454
ln -s ${lib.getLib lldb} $out/share/lldb
4555
makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \
46-
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
56+
--set-default LLDB_DEBUGSERVER_PATH "${lldbServer}"
4757
'';
4858

4959
patches = [ ./patches/adapter-output-shared_object.patch ];
5060

5161
# Tests are linked to liblldb but it is not available here.
5262
doCheck = false;
63+
64+
passthru = { inherit lldbServer; };
5365
}

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix

+1-9
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ let
6464
}
6565
);
6666

67-
# debugservers on macOS require the 'com.apple.security.cs.debugger'
68-
# entitlement which nixpkgs' lldb-server does not yet provide; see
69-
# <https://github.com/NixOS/nixpkgs/pull/38624> for details
70-
lldbServer =
71-
if stdenv.hostPlatform.isDarwin then
72-
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver"
73-
else
74-
"${lldb.out}/bin/lldb-server";
7567
in
7668
stdenv.mkDerivation {
7769
pname = "vscode-extension-${publisher}-${pname}";
@@ -130,7 +122,7 @@ stdenv.mkDerivation {
130122
cp -t $ext/ -r ${adapter}/share/*
131123
wrapProgram $ext/adapter/codelldb \
132124
--prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \
133-
--set-default LLDB_DEBUGSERVER_PATH "${lldbServer}"
125+
--set-default LLDB_DEBUGSERVER_PATH "${adapter.lldbServer}"
134126
# Mark that all components are installed.
135127
touch $ext/platform.ok
136128

0 commit comments

Comments
 (0)