fiddlerwoaroof/improvise
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: reformat

Browse Source
This commit is contained in:
Edward Langley
2026-03-30 22:28:45 -07:00
parent f19f503ab1
commit 856b5d5d41
1 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
flake.nix
View File

@ -10,24 +10,29 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs, rust-overlay, flake-utils }: outputs = {
flake-utils.lib.eachDefaultSystem (system: self,
let nixpkgs,
overlays = [ (import rust-overlay) ]; rust-overlay,
pkgs = import nixpkgs { inherit system overlays; }; flake-utils,
}:
flake-utils.lib.eachDefaultSystem (system: let
overlays = [(import rust-overlay)];
pkgs = import nixpkgs {inherit system overlays;};
isLinux = pkgs.lib.hasInfix "linux" system; isLinux = pkgs.lib.hasInfix "linux" system;
rustToolchain = pkgs.rust-bin.stable.latest.default.override { rustToolchain = pkgs.rust-bin.stable.latest.default.override {
extensions = [ "rust-src" "clippy" "rustfmt" ]; extensions = ["rust-src" "clippy" "rustfmt"];
targets = pkgs.lib.optionals isLinux [ "x86_64-unknown-linux-musl" ]; targets = pkgs.lib.optionals isLinux ["x86_64-unknown-linux-musl"];
}; };
in in {
{
devShells.default = pkgs.mkShell ({ devShells.default = pkgs.mkShell ({
nativeBuildInputs = [ nativeBuildInputs =
[
rustToolchain rustToolchain
pkgs.pkg-config pkgs.pkg-config
] ++ pkgs.lib.optionals isLinux [ ]
++ pkgs.lib.optionals isLinux [
# Provide cc (gcc) for building proc-macro / build-script crates # Provide cc (gcc) for building proc-macro / build-script crates
# that target the host (x86_64-unknown-linux-gnu). # that target the host (x86_64-unknown-linux-gnu).
pkgs.gcc pkgs.gcc
@ -36,20 +41,20 @@
]; ];
RUST_BACKTRACE = "1"; RUST_BACKTRACE = "1";
} // pkgs.lib.optionalAttrs isLinux { }
// pkgs.lib.optionalAttrs isLinux {
# Tell Cargo which linker to use for each target so it never # Tell Cargo which linker to use for each target so it never
# falls back to rust-lld (which can't find glibc on NixOS). # falls back to rust-lld (which can't find glibc on NixOS).
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = "${pkgs.gcc}/bin/gcc";
"${pkgs.gcc}/bin/gcc"; CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER = "${pkgs.pkgsMusl.stdenv.cc}/bin/cc";
CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER =
"${pkgs.pkgsMusl.stdenv.cc}/bin/cc";
# Default build target: static musl binary. # Default build target: static musl binary.
CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
}); });
packages.default = packages.default =
if isLinux then if isLinux
then
(pkgs.pkgsMusl.makeRustPlatform { (pkgs.pkgsMusl.makeRustPlatform {
cargo = rustToolchain; cargo = rustToolchain;
rustc = rustToolchain; rustc = rustToolchain;