diff --git a/default.nix b/default.nix index 2a9fc2b..45baa25 100644 --- a/default.nix +++ b/default.nix @@ -1,38 +1,35 @@ { lib, stdenv, - rust-bin, # From overlay + rust, makeRustPlatform, packageToml, - rust, libiconv, darwin, python3, -}: let - mkPackage = rust: - (makeRustPlatform { - cargo = rust; - rustc = rust; - }) - .buildRustPackage { - pname = packageToml.name; - inherit (packageToml) version; +}: +(makeRustPlatform { + cargo = rust; + rustc = rust; +}) +.buildRustPackage { + pname = packageToml.name; + inherit (packageToml) version; - src = builtins.path { - path = ./.; - inherit (packageToml) name; - }; + src = builtins.path { + path = ./.; + inherit (packageToml) name; + }; - dontUseCargoParallelTests = true; + dontUseCargoParallelTests = true; - cargoLock.lockFile = ./Cargo.lock; + cargoLock.lockFile = ./Cargo.lock; - nativeBuildInputs = [ rust ]; - buildInputs = (lib.optional stdenv.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Foundation - ]); + nativeBuildInputs = [rust]; + buildInputs = lib.optional stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Foundation + ]; - nativeCheckInputs = [python3]; - }; -in (mkPackage rust-bin.stable.latest.minimal) + nativeCheckInputs = [python3]; +} diff --git a/flake.nix b/flake.nix index c1f0ab4..beba5e9 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ }: let packageToml = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package; in { - formatter = pkgs.alejandra; + formatter = pkgs.alejandra; _module.args = { pkgs = import inputs.nixpkgs { @@ -33,7 +33,10 @@ devShells = pkgs.callPackages ./shell.nix {inherit packageToml self';}; - packages.default = pkgs.callPackage ./default.nix {inherit packageToml;}; + packages.default = pkgs.callPackage ./default.nix { + inherit packageToml; + rust = pkgs.rust-bin.stable.latest.minimal; + }; }; }; }