fix: overriding extensions shadowed env extensions

GetPsyched · Nov 7, 2023 · 9a5b427 · 9a5b427
1 parent 9f76229
commit 9a5b427
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -21,7 +21,7 @@
         }) { };
 
         vscodium = ({ environments ? [ "nix" ] }: callPackage ./packages/vscodium.nix {
-          extensions = (builtins.concatMap (env: (import ./devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments);
+          envExtensions = (builtins.concatMap (env: (import ./devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments);
         }) { };
       });
     };

diff --git a/packages/vscodium.nix b/packages/vscodium.nix
@@ -1,11 +1,11 @@
-{ extensions ? [ ], pkgs, ... }:
+{ envExtensions ? [ ], extensions ? [ ], pkgs, ... }:
 
 with pkgs; symlinkJoin {
   name = "vscodium";
   paths = [
     (vscode-with-extensions.override {
       vscode = vscodium;
-      vscodeExtensions = extensions;
+      vscodeExtensions = envExtensions ++ extensions;
     })
 
     # Fix for: https://discourse.nixos.org/t/interactive-bash-with-nix-develop-flake/15486