xqtc/yotei
1
0
Fork 0
Code Issues 2 Pull requests Actions Packages Projects Releases Wiki Activity

nix fmt; add aarch64 arch to flake
Some checks failed
/ build (push) Failing after 1m38s
Details
/ clippy (push) Failing after 1m18s
Details

Browse source
This commit is contained in:
xqtc 2024-09-05 18:29:11 +02:00
parent c6d745d25f
commit b4a78bd726
1 changed files with 58 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
flake.nix
View file

@ -3,7 +3,6 @@
# either `curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install` # either `curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install`
# or https://github.com/DeterminateSystems/nix-installer # or https://github.com/DeterminateSystems/nix-installer
# and then `nix build` or `nix develop` # and then `nix build` or `nix develop`
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@ -15,66 +14,71 @@
}; };
outputs = inputs: outputs = inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } { inputs.flake-parts.lib.mkFlake {inherit inputs;} {
systems = [ "x86_64-linux" ]; systems = ["x86_64-linux" "aarch64-linux"];
imports = [ imports = [
inputs.treefmt-nix.flakeModule inputs.treefmt-nix.flakeModule
]; ];
perSystem = { config, self', pkgs, lib, system, ... }: perSystem = {
let config,
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); self',
nonRustDeps = [ pkgs,
pkgs.libiconv lib,
pkgs.pkg-config system,
pkgs.protobuf ...
}: let
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
nonRustDeps = [
pkgs.libiconv
pkgs.pkg-config
pkgs.protobuf
];
rust-toolchain = pkgs.symlinkJoin {
name = "rust-toolchain";
paths = [pkgs.rustc pkgs.cargo pkgs.cargo-watch pkgs.rust-analyzer pkgs.rustPlatform.rustcSrc];
};
in {
# Rust package
packages.default = pkgs.rustPlatform.buildRustPackage {
inherit (cargoToml.package) name version;
nativeBuildInputs = nonRustDeps;
buildInputs = nonRustDeps;
src = ./.;
cargoLock.lockFile = ./Cargo.lock;
};
# Rust dev environment
devShells.default = pkgs.mkShell {
inputsFrom = [
config.treefmt.build.devShell
]; ];
rust-toolchain = pkgs.symlinkJoin { shellHook = ''
name = "rust-toolchain"; # For rust-analyzer 'hover' tooltips to work.
paths = [ pkgs.rustc pkgs.cargo pkgs.cargo-watch pkgs.rust-analyzer pkgs.rustPlatform.rustcSrc ]; export RUST_SRC_PATH=${pkgs.rustPlatform.rustLibSrc}
}; export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.vulkan-loader}/lib/:${pkgs.wayland}/lib/:${pkgs.libxkbcommon}/lib/
in echo $RUST_SRC_PATH
{
# Rust package
packages.default = pkgs.rustPlatform.buildRustPackage {
inherit (cargoToml.package) name version;
nativeBuildInputs = nonRustDeps;
buildInputs = nonRustDeps;
src = ./.;
cargoLock.lockFile = ./Cargo.lock;
};
# Rust dev environment echo
devShells.default = pkgs.mkShell { echo "Run 'just <recipe>' to get started"
inputsFrom = [ just
config.treefmt.build.devShell '';
]; buildInputs = nonRustDeps;
shellHook = '' nativeBuildInputs = with pkgs; [
# For rust-analyzer 'hover' tooltips to work. just
export RUST_SRC_PATH=${pkgs.rustPlatform.rustLibSrc} rust-toolchain
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.vulkan-loader}/lib/:${pkgs.wayland}/lib/:${pkgs.libxkbcommon}/lib/ ];
echo $RUST_SRC_PATH RUST_BACKTRACE = 1;
};
echo # Add your auto-formatters here.
echo "Run 'just <recipe>' to get started" # cf. https://numtide.github.io/treefmt/
just treefmt.config = {
''; projectRootFile = "flake.nix";
buildInputs = nonRustDeps; programs = {
nativeBuildInputs = with pkgs; [ nixpkgs-fmt.enable = true;
just rustfmt.enable = true;
rust-toolchain
];
RUST_BACKTRACE = 1;
};
# Add your auto-formatters here.
# cf. https://numtide.github.io/treefmt/
treefmt.config = {
projectRootFile = "flake.nix";
programs = {
nixpkgs-fmt.enable = true;
rustfmt.enable = true;
};
}; };
}; };
};
}; };
} }