Skip to content

Commit 9a5b427

Browse files
committed
fix: overriding extensions shadowed env extensions
1 parent 9f76229 commit 9a5b427

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}) { };
2222

2323
vscodium = ({ environments ? [ "nix" ] }: callPackage ./packages/vscodium.nix {
24-
extensions = (builtins.concatMap (env: (import ./devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments);
24+
envExtensions = (builtins.concatMap (env: (import ./devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments);
2525
}) { };
2626
});
2727
};

packages/vscodium.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{ extensions ? [ ], pkgs, ... }:
1+
{ envExtensions ? [ ], extensions ? [ ], pkgs, ... }:
22

33
with pkgs; symlinkJoin {
44
name = "vscodium";
55
paths = [
66
(vscode-with-extensions.override {
77
vscode = vscodium;
8-
vscodeExtensions = extensions;
8+
vscodeExtensions = envExtensions ++ extensions;
99
})
1010

1111
# Fix for: https://discourse.nixos.org/t/interactive-bash-with-nix-develop-flake/15486

0 commit comments

Comments
 (0)