mirror of
https://github.com/nix-community/flakelight.git
synced 2025-02-08 21:49:24 +01:00
Fix devShell attributes added at wrong level
This commit is contained in:
parent
412add2d01
commit
50c4ad5cff
16
default.nix
16
default.nix
@ -500,13 +500,15 @@ let
|
||||
inherit (merged) templates;
|
||||
})
|
||||
(prev: eachSystem ({ pkgs, system, mkShell, ... }: {
|
||||
devShells.default = mkShell (merged.env pkgs // {
|
||||
inputsFrom = optional (prev ? packages.${system}.default)
|
||||
prev.packages.${system}.default;
|
||||
packages = merged.devTools pkgs;
|
||||
shellHook = merged.shellHook pkgs;
|
||||
});
|
||||
} // (callPkgs pkgs (merged.devShells pkgs))))
|
||||
devShells = {
|
||||
default = mkShell (merged.env pkgs // {
|
||||
inputsFrom = optional (prev ? packages.${system}.default)
|
||||
prev.packages.${system}.default;
|
||||
packages = merged.devTools pkgs;
|
||||
shellHook = merged.shellHook pkgs;
|
||||
});
|
||||
} // (callPkgs pkgs (merged.devShells pkgs));
|
||||
}))
|
||||
(eachSystem root'.perSystem)
|
||||
(_: root'.outputs)
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user