From 99586477e0c7ce4d8dfbc884ba00c5cc554f0d3b Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Tue, 16 Jan 2024 17:23:26 +0000 Subject: [PATCH] Break up dependencies in different groups --- flake.nix | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 64e6227..ff583bc 100644 --- a/flake.nix +++ b/flake.nix @@ -165,38 +165,43 @@ old.preInstallCheck; }); - native_build_inputs = (with pkgs; [ + buildToolsDeps = (with pkgs; [ cmake ninja - ccache - git' - zsh - zsh-autosuggestions - zsh-autocomplete - zsh-syntax-highlighting - python3 - iwyu - gc llvm llvmPackages_17.mlir llvmPackages_17.clang - ]); + iwyu + ]); - build_inputs = with pkgs; [ + buildDevToolsDeps = (with pkgs; [ + ccache + git' + python3 + zsh + zsh-autosuggestions + zsh-autocomplete + zsh-syntax-highlighting + ]); + + buildDeps = (with pkgs; [ gc - gtest - gmock zlib' llvm llvmPackages_17.mlir llvmPackages_17.clang - ]; + ]); + + testDeps = (with pkgs; [ + gtest + gmock + ]); in { inherit pkgs; devShells.default = (pkgs.mkShell.override { stdenv = stdenv';}) { - nativeBuildInputs = native_build_inputs; - buildInputs = build_inputs; + nativeBuildInputs = buildDevToolsDeps ++ buildToolsDeps; + buildInputs = buildDeps ++ testDeps; shellHook = '' ZDOTDIR=${zshDir} zsh -d && exit