Merge pull request #211321 from mstone/darwin-fix-vscode-lldb
vscode-extensions.vadimcn.vscode-lldb: fix on Darwin
This commit is contained in:
commit
abc1cca9c7
|
@ -27,8 +27,14 @@ let
|
||||||
|
|
||||||
cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo=";
|
cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo=";
|
||||||
|
|
||||||
|
buildInputs = lib.optionals stdenv.isDarwin [ lldb ];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
env = lib.optionalAttrs stdenv.isDarwin {
|
||||||
|
NIX_LDFLAGS = "-llldb -lc++abi";
|
||||||
|
};
|
||||||
|
|
||||||
buildAndTestSubdir = "adapter";
|
buildAndTestSubdir = "adapter";
|
||||||
|
|
||||||
buildFeatures = [ "weak-linkage" ];
|
buildFeatures = [ "weak-linkage" ];
|
||||||
|
@ -89,6 +95,15 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# debugservers on macOS require the 'com.apple.security.cs.debugger'
|
||||||
|
# entitlement which nixpkgs' lldb-server does not yet provide; see
|
||||||
|
# <https://github.com/NixOS/nixpkgs/pull/38624> for details
|
||||||
|
lldbServer =
|
||||||
|
if stdenv.isDarwin then
|
||||||
|
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver"
|
||||||
|
else
|
||||||
|
"${lldb.out}/bin/lldb-server";
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
pname = "vscode-extension-${publisher}-${pname}";
|
pname = "vscode-extension-${publisher}-${pname}";
|
||||||
inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName;
|
inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName;
|
||||||
|
@ -107,6 +122,9 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
postConfigure = ''
|
postConfigure = ''
|
||||||
cp -r ${nodeDeps}/lib/node_modules .
|
cp -r ${nodeDeps}/lib/node_modules .
|
||||||
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
export HOME="$TMPDIR/home"
|
||||||
|
mkdir $HOME
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
@ -129,7 +147,8 @@ in stdenv.mkDerivation {
|
||||||
mv -t $ext vsix-extracted/extension/*
|
mv -t $ext vsix-extracted/extension/*
|
||||||
cp -t $ext/ -r ${adapter}/share/*
|
cp -t $ext/ -r ${adapter}/share/*
|
||||||
wrapProgram $ext/adapter/codelldb \
|
wrapProgram $ext/adapter/codelldb \
|
||||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
--prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \
|
||||||
|
--set-default LLDB_DEBUGSERVER_PATH "${lldbServer}"
|
||||||
# Mark that all components are installed.
|
# Mark that all components are installed.
|
||||||
touch $ext/platform.ok
|
touch $ext/platform.ok
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user