Unverified Commit 8c429107 authored by Randy Eckenrode's avatar Randy Eckenrode Committed by GitHub
Browse files

Merge pull request #309165 from reckenrode/lldb-fix

parents 5c1ff7d6 a14bae87

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

+1 −1
Original line number Diff line number Diff line
@@ -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"

    '';

pkgs/development/compilers/llvm/common/lldb.nix

+3 −1
Original line number Diff line number Diff line
@@ -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}";