extern/flakelight
1
0
Fork 1
mirror of https://github.com/nix-community/flakelight.git synced 2025-02-13 07:59:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix devShell attributes added at wrong level

Browse Source
This commit is contained in:
Archit Gupta 2023-07-02 11:42:23 -07:00
parent 412add2d01
commit 50c4ad5cff
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
default.nix
View File

@ -500,13 +500,15 @@ let
inherit (merged) templates; inherit (merged) templates;
}) })
(prev: eachSystem ({ pkgs, system, mkShell, ... }: { (prev: eachSystem ({ pkgs, system, mkShell, ... }: {
devShells.default = mkShell (merged.env pkgs // { devShells = {
inputsFrom = optional (prev ? packages.${system}.default) default = mkShell (merged.env pkgs // {
prev.packages.${system}.default; inputsFrom = optional (prev ? packages.${system}.default)
packages = merged.devTools pkgs; prev.packages.${system}.default;
shellHook = merged.shellHook pkgs; packages = merged.devTools pkgs;
}); shellHook = merged.shellHook pkgs;
} // (callPkgs pkgs (merged.devShells pkgs)))) });
} // (callPkgs pkgs (merged.devShells pkgs));
}))
(eachSystem root'.perSystem) (eachSystem root'.perSystem)
(_: root'.outputs) (_: root'.outputs)
]; ];