summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-17 06:01:28 +0000
committerGitHub <noreply@github.com>2021-11-17 06:01:28 +0000
commitf8cf67790e37ea0e5dd1d84755d89f45417fcff8 (patch)
tree4374cc0b47c7793c9b31f240ee21510691cd4bfe /pkgs/misc
parent485e62c1840ba0b3d96774c100ee4df311a1a71e (diff)
parent2e7f48aabfa54fe37510a7922cfba14e3d600c83 (diff)
downloadnixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar
nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.gz
nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.bz2
nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.lz
nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.xz
nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.tar.zst
nixpkgs-f8cf67790e37ea0e5dd1d84755d89f45417fcff8.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/vscode-extensions/vscode-lldb/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
index 3a01058c99c..2bc9321353d 100644
--- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
@@ -31,10 +31,11 @@ let
 
     buildAndTestSubdir = "adapter";
 
+    buildFeatures = [ "weak-linkage" ];
+
     cargoBuildFlags = [
       "--lib"
       "--bin=codelldb"
-      "--features=weak-linkage"
     ];
 
     # Tests are linked to liblldb but it is not available here.