Commit 47c82b0c authored by Francis Gagné's avatar Francis Gagné Committed by Masum Reza
Browse files

vscode-extensions.vadimcn.vscode-lldb: various adjustments following review 

- Use `callPackage` instead of `import` for inner packages
- Change `libcxxStdenv` to `llvmPackages_19.libcxxStdenv`
- Move overrides from `.../vscode/extensions/default.nix` to
  `.../vscode/extensions/vadimcn.vscode-lldb/default.nix`
- adapter: Fix LLVM_TRIPLE
parent d8b50484

pkgs/applications/editors/vscode/extensions/default.nix

+1 −16
Original line number Diff line number Diff line
@@ -3,20 +3,15 @@ 
{

  autoPatchelfHook,

  callPackage,

  cargo,

  config,

  fetchurl,

  jdk,

  jq,

  lib,

  libcxxStdenv,

  llvmPackages,

  llvmPackages_19,

  makeRustPlatform,

  moreutils,

  protobuf,

  python3Packages,

  rustc,

  stdenv,

  vscode-utils,

  zlib,
@@ -5123,17 +5118,7 @@ let 
        };

      };



      vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb {

        llvmPackages = llvmPackages_19;

        # The adapter is meant to be compiled with clang++,

        # based on the provided CMake toolchain files.

        # <https://github.com/vadimcn/codelldb/tree/master/cmake>

        rustPlatform = makeRustPlatform {

          stdenv = libcxxStdenv;

          inherit cargo rustc;

        };

        stdenv = libcxxStdenv;

      };

      vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { };



      valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec {

        mktplcRef = {

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ let 
      "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver"

    else

      "${lib.getBin lldb}/bin/lldb-server";

  LLVM_TRIPLE = stdenv.hostPlatform.config;

  LLVM_TRIPLE = stdenv.buildPlatform.rust.rustcTarget;

in

rustPlatform.buildRustPackage {

  pname = "${pname}-adapter";

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

+21 −23
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  callPackage,

  cargo,

  cmake,

  fetchFromGitHub,

  rustPlatform,

  lib,

  llvmPackages_19,

  makeRustPlatform,

  makeWrapper,

  llvmPackages,

  buildNpmPackage,

  cmake,

  nodejs,

  unzip,

  python3,

  pkg-config,

  libsecret,

  rustc,

  stdenv,

  unzip,

}:

assert lib.versionAtLeast python3.version "3.5";

let
@@ -30,17 +30,20 @@ let 
    hash = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI=";

  };



  lldb = llvmPackages.lldb;

  lldb = llvmPackages_19.lldb;



  adapter = (

    import ./adapter.nix {

      inherit

        lib

        lldb

        makeWrapper

        rustPlatform

        stdenv

    callPackage ./adapter.nix {

      # The adapter is meant to be compiled with clang++,

      # based on the provided CMake toolchain files.

      # <https://github.com/vadimcn/codelldb/tree/master/cmake>

      rustPlatform = makeRustPlatform {

        stdenv = llvmPackages_19.libcxxStdenv;

        inherit cargo rustc;

      };

      stdenv = llvmPackages_19.libcxxStdenv;



      inherit

        pname

        src

        version
@@ -49,13 +52,8 @@ let 
  );



  nodeDeps = (

    import ./node_deps.nix {

    callPackage ./node_deps.nix {

      inherit

        buildNpmPackage

        libsecret

        pkg-config

        python3



        pname

        src

        version