diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-01-03 17:56:26 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-01-04 12:52:46 +0100 |
| commit | de37658b94d6ac54721e18316dd8dddf50589afb (patch) | |
| tree | dd2c7643cddfd4bb24173cacd15443c1a8066c99 | |
| parent | e59c23a69df116737c428ccbfbe4dfeff4d956d5 (diff) | |
| download | garage-de37658b94d6ac54721e18316dd8dddf50589afb.tar.gz garage-de37658b94d6ac54721e18316dd8dddf50589afb.zip | |
Hopefully fix Nix build
| -rw-r--r-- | Cargo.nix | 3 | ||||
| -rw-r--r-- | default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -253,7 +253,7 @@ in registry = "registry+https://github.com/rust-lang/crates.io-index"; src = fetchCratesIo { inherit name version; sha256 = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"; }; dependencies = { - ${ if hostPlatform.config == "aarch64-apple-darwin" || hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.103" { inherit profileName; }; + ${ if hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" || hostPlatform.config == "aarch64-apple-darwin" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.103" { inherit profileName; }; }; }); @@ -716,6 +716,7 @@ in dependencies = { arc_swap = rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.4.0" { inherit profileName; }; async_trait = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.51" { profileName = "__noProfile"; }; + err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.0" { profileName = "__noProfile"; }; futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; garage_model_050 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_model."0.5.1" { inherit profileName; }; diff --git a/default.nix b/default.nix index d44d5741..e0336174 100644 --- a/default.nix +++ b/default.nix @@ -56,7 +56,7 @@ in let */ ''^(src|tests)'' # fixed default ''.*\.(rs|toml)$'' # fixed default - ''^(crdt|replication|cli)'' # our crate submodules + ''^(crdt|replication|cli|helper)'' # our crate submodules ]; }; |