diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | shell.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix index 77b518c..08fce62 100644 --- a/flake.nix +++ b/flake.nix @@ -61,8 +61,6 @@ }; }; - devShells.default = pkgs.callPackage ./shell.nix { - inherit (pkgs.nodePackages) typescript typescript-language-server; - }; + devShells.default = pkgs.callPackage ./shell.nix {}; }); } diff --git a/shell.nix b/shell.nix index bf099b0..ce3991f 100644 --- a/shell.nix +++ b/shell.nix @@ -3,7 +3,7 @@ , cargo-crev, cargo-audit , xh, systemfd, tokio-console, sqlx-cli , pkg-config, protobuf, openssl -, typescript, typescript-language-server, caddy +, nodePackages, caddy }: mkShell { name = "rust-dev-shell"; @@ -13,9 +13,10 @@ mkShell { cargo-watch cargo-edit cargo-outdated cargo-crev cargo-audit sqlx-cli xh systemfd caddy - typescript typescript-language-server # protobuf is required for tokio-console's console-subscriber #tokio-console protobuf pkg-config openssl - ]; + ] ++ (with nodePackages; [ + typescript typescript-language-server + ]); } |