Skip to content

Commit f80e667

Browse files
committed
fix: could not override environments in vscodium
1 parent e5b57e3 commit f80e667

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

flake.nix

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
in
1818
{
1919
packages = forAllSystems (pkgs: with pkgs; {
20-
default = ({ environments ? [ "nix" ] }: callPackage ./packages/default.nix { inherit environments; }) { };
21-
22-
vscodium = ({ environments ? [ "nix" ] }: callPackage ./packages/vscodium.nix {
23-
envExtensions = (builtins.concatMap (env: (import ./devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments);
24-
}) { };
20+
default = callPackage ./packages/default.nix { };
21+
vscodium = callPackage ./packages/vscodium.nix { };
2522
});
2623
};
2724
}

packages/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ environments, pkgs, ... }:
1+
{ environments ? [ "nix" ], pkgs, ... }:
22

33
with pkgs; symlinkJoin {
44
name = "default";

packages/vscodium.nix

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

33
with pkgs; symlinkJoin {
44
name = "vscodium";
55
paths = [
66
(vscode-with-extensions.override {
77
vscode = vscodium;
8-
vscodeExtensions = envExtensions ++ extensions;
8+
vscodeExtensions = (builtins.concatMap (env: (import ../devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments) ++ extensions;
99
})
1010

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

0 commit comments

Comments
 (0)