Commit d304789 1 parent 6b31915 commit d304789 Copy full SHA for d304789
File tree 2 files changed +14
-10
lines changed
pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb
2 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 9
9
src ,
10
10
version ,
11
11
} :
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
12
22
rustPlatform . buildRustPackage {
13
23
pname = "${ pname } -adapter" ;
14
24
inherit version src ;
@@ -43,11 +53,13 @@ rustPlatform.buildRustPackage {
43
53
cp -t $out/share/formatters formatters/*.py
44
54
ln -s ${ lib . getLib lldb } $out/share/lldb
45
55
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 } "
47
57
'' ;
48
58
49
59
patches = [ ./patches/adapter-output-shared_object.patch ] ;
50
60
51
61
# Tests are linked to liblldb but it is not available here.
52
62
doCheck = false ;
63
+
64
+ passthru = { inherit lldbServer ; } ;
53
65
}
Original file line number Diff line number Diff line change 64
64
}
65
65
) ;
66
66
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" ;
75
67
in
76
68
stdenv . mkDerivation {
77
69
pname = "vscode-extension-${ publisher } -${ pname } " ;
@@ -130,7 +122,7 @@ stdenv.mkDerivation {
130
122
cp -t $ext/ -r ${ adapter } /share/*
131
123
wrapProgram $ext/adapter/codelldb \
132
124
--prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \
133
- --set-default LLDB_DEBUGSERVER_PATH "${ lldbServer } "
125
+ --set-default LLDB_DEBUGSERVER_PATH "${ adapter . lldbServer } "
134
126
# Mark that all components are installed.
135
127
touch $ext/platform.ok
136
128
You can’t perform that action at this time.
0 commit comments