colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #309165 from reckenrode/lldb-fix

Browse Source
This commit is contained in:
Randy Eckenrode 2024-05-05 10:59:14 -04:00 committed by GitHub
commit 8c429107e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"
'';

4
pkgs/development/compilers/llvm/common/lldb.nix
View File

@ -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}";