nix: shell.nix works standalone again

main
Zynh Ludwig 2024-07-29 23:30:34 -07:00
parent 1e8afa8a2f
commit 64e272be5d
2 changed files with 12 additions and 5 deletions

View File

@ -24,6 +24,15 @@
})); }));
in in
{ {
devShells = forAllSystems (pkgs: { default = import ./shell.nix { inherit pkgs; }; }); devShells = forAllSystems
(pkgs: {
default = import ./shell.nix
{
inherit pkgs;
additionalBuildInputs = [
(pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default))
];
};
});
}; };
} }

View File

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { }, additionalBuildInputs ? [ ] }:
with pkgs; with pkgs;
@ -18,8 +18,6 @@ mkShell rec {
libxkbcommon # To use the wayland feature libxkbcommon # To use the wayland feature
wayland wayland
] ++ additionalBuildInputs;
(rust-bin.selectLatestNightlyWith (toolchain: toolchain.default))
];
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
} }