From 47c82b0cf53c12c190b5c9badfd7554e82e6ddc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Mon, 31 Mar 2025 01:24:27 -0400
Subject: [PATCH] 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
---
 .../editors/vscode/extensions/default.nix     | 17 +------
 .../vadimcn.vscode-lldb/adapter.nix           |  2 +-
 .../vadimcn.vscode-lldb/default.nix           | 46 +++++++++----------
 3 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bd964fc6dc5c..3e6801d29efb 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -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 = {
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
index 7ba5ee0e0aff..2acd09bd9248 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix
@@ -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";
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index 5e4e6e24702a..d3ff70cca2f6 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -1,17 +1,17 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-  makeWrapper,
-  llvmPackages,
-  buildNpmPackage,
+  callPackage,
+  cargo,
   cmake,
+  fetchFromGitHub,
+  lib,
+  llvmPackages_19,
+  makeRustPlatform,
+  makeWrapper,
   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