From 6be48da010f83a1e0f8f6402fda7bfcef796a702 Mon Sep 17 00:00:00 2001 From: Reed Krantz Date: Wed, 18 Feb 2026 17:45:14 -0600 Subject: [PATCH] fix(flake): add the templates build dependency fix to this project --- flake.nix | 66 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index a0985de..b72b262 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,17 @@ systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; perSystem = {system, ...}: let - src = ./.; + src = craneLib.cleanCargoSource ./.; + + # runtime dependencies + buildInputs = with pkgs; [ + # openssl + ]; + + # build dependencies + nativeBuildInputs = with pkgs; [ + # pkg-config + ]; pkgs = import nixpkgs { inherit system; @@ -42,42 +52,14 @@ # Build *just* the cargo dependencies, so we can reuse # all of that work (e.g. via cachix) when running in CI cargoArtifacts = craneLib.buildDepsOnly { - inherit src; + inherit src buildInputs nativeBuildInputs; }; in rec { - # Formatter for nix files, available through 'nix fmt' - formatter = pkgs.alejandra; - - # Your custom packages - # Accessible through 'nix build', 'nix shell', 'nix run', etc - packages = { - default = craneLib.buildPackage { - inherit src cargoArtifacts; - - # runtime dependencies - # buildInputs = []; - - # build dependencies - # nativeBuildInputs = [pkgs.pkg-config]; - }; - }; - - checks = { - clippy = craneLib.cargoClippy { - inherit src cargoArtifacts; - cargoClippyExtraArgs = "-- --deny warnings"; - }; - - fmt = craneLib.cargoFmt { - inherit src cargoArtifacts; - }; - }; - # Dev Shell that lets you enter an environment with all the necessary utilites # Available through 'nix develop' # Also can be activated automatically if direnv is installed on the system with 'direnv allow' devShells.default = craneLib.devShell { - inherit cargoArtifacts checks; + inherit checks; # extra tooling dependencies packages = with pkgs; [ @@ -87,6 +69,28 @@ inputsFrom = [packages.default]; }; + + # Formatter for nix files, available through 'nix fmt' + formatter = pkgs.alejandra; + + # Your custom packages + # Accessible through 'nix build', 'nix shell', 'nix run', etc + packages = { + default = craneLib.buildPackage { + inherit src buildInputs nativeBuildInputs cargoArtifacts; + }; + }; + + checks = { + clippy = craneLib.cargoClippy { + inherit src buildInputs nativeBuildInputs cargoArtifacts; + cargoClippyExtraArgs = "-- --deny warnings"; + }; + + fmt = craneLib.cargoFmt { + inherit src buildInputs nativeBuildInputs; + }; + }; }; }; }