Skip to content

Commit 5a1da55

Browse files
authored
fix(darwin/nix): use clang 20 instead of clang 21 to fix dep build (#35)
1 parent 895c9b8 commit 5a1da55

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"publisher": "sysdig",
44
"displayName": "Sysdig Scanner",
55
"description": "Sysdig Scanner for Visual Studio Code",
6-
"version": "0.2.13",
6+
"version": "0.2.14",
77
"icon": "img/logo.png",
88
"repository": "https://github.com/sysdiglabs/vscode-extension",
99
"engines": {

vsix.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
apple-sdk,
32
buildNpmPackage,
3+
clang_20,
44
lib,
55
libsecret,
66
pkg-config,
@@ -19,8 +19,12 @@ buildNpmPackage {
1919
nativeBuildInputs = [
2020
pkg-config
2121
vsce
22+
]
23+
++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar
24+
25+
buildInputs = [
26+
libsecret
2227
];
23-
buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin [ apple-sdk ];
2428

2529
dontNpmBuild = true;
2630
dontNpmInstall = true;

0 commit comments

Comments
 (0)