Skip to content

Commit 47c82b0

Browse files
FraGagJohnRTitor
authored andcommitted
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
1 parent d8b5048 commit 47c82b0

File tree

3 files changed

+23
-40
lines changed

3 files changed

+23
-40
lines changed

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,15 @@
33
{
44
autoPatchelfHook,
55
callPackage,
6-
cargo,
76
config,
87
fetchurl,
98
jdk,
109
jq,
1110
lib,
12-
libcxxStdenv,
1311
llvmPackages,
14-
llvmPackages_19,
15-
makeRustPlatform,
1612
moreutils,
1713
protobuf,
1814
python3Packages,
19-
rustc,
2015
stdenv,
2116
vscode-utils,
2217
zlib,
@@ -5123,17 +5118,7 @@ let
51235118
};
51245119
};
51255120

5126-
vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb {
5127-
llvmPackages = llvmPackages_19;
5128-
# The adapter is meant to be compiled with clang++,
5129-
# based on the provided CMake toolchain files.
5130-
# <https://github.com/vadimcn/codelldb/tree/master/cmake>
5131-
rustPlatform = makeRustPlatform {
5132-
stdenv = libcxxStdenv;
5133-
inherit cargo rustc;
5134-
};
5135-
stdenv = libcxxStdenv;
5136-
};
5121+
vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { };
51375122

51385123
valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec {
51395124
mktplcRef = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let
1818
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver"
1919
else
2020
"${lib.getBin lldb}/bin/lldb-server";
21-
LLVM_TRIPLE = stdenv.hostPlatform.config;
21+
LLVM_TRIPLE = stdenv.buildPlatform.rust.rustcTarget;
2222
in
2323
rustPlatform.buildRustPackage {
2424
pname = "${pname}-adapter";

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

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
lib,
3-
stdenv,
2+
callPackage,
3+
cargo,
4+
cmake,
45
fetchFromGitHub,
5-
rustPlatform,
6+
lib,
7+
llvmPackages_19,
8+
makeRustPlatform,
69
makeWrapper,
7-
llvmPackages,
8-
buildNpmPackage,
9-
cmake,
1010
nodejs,
11-
unzip,
1211
python3,
13-
pkg-config,
14-
libsecret,
12+
rustc,
13+
stdenv,
14+
unzip,
1515
}:
1616
assert lib.versionAtLeast python3.version "3.5";
1717
let
@@ -30,17 +30,20 @@ let
3030
hash = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI=";
3131
};
3232

33-
lldb = llvmPackages.lldb;
33+
lldb = llvmPackages_19.lldb;
3434

3535
adapter = (
36-
import ./adapter.nix {
37-
inherit
38-
lib
39-
lldb
40-
makeWrapper
41-
rustPlatform
42-
stdenv
36+
callPackage ./adapter.nix {
37+
# The adapter is meant to be compiled with clang++,
38+
# based on the provided CMake toolchain files.
39+
# <https://github.com/vadimcn/codelldb/tree/master/cmake>
40+
rustPlatform = makeRustPlatform {
41+
stdenv = llvmPackages_19.libcxxStdenv;
42+
inherit cargo rustc;
43+
};
44+
stdenv = llvmPackages_19.libcxxStdenv;
4345

46+
inherit
4447
pname
4548
src
4649
version
@@ -49,13 +52,8 @@ let
4952
);
5053

5154
nodeDeps = (
52-
import ./node_deps.nix {
55+
callPackage ./node_deps.nix {
5356
inherit
54-
buildNpmPackage
55-
libsecret
56-
pkg-config
57-
python3
58-
5957
pname
6058
src
6159
version

0 commit comments

Comments
 (0)