From 9e52119b594d8205161df35fc7133c75d904d5d0 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Thu, 23 Sep 2021 12:45:25 +0200 Subject: [PATCH] update gmp-mpfr-sys to fix non gcc builds --- Cargo.lock | 5 ++--- Cargo.toml | 3 +++ flake.nix | 10 +++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49401c9..603173c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,9 +152,8 @@ dependencies = [ [[package]] name = "gmp-mpfr-sys" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57fdb339d49833021b1fded600ed240ae907e33909d5511a61dff884df7f16e" +version = "1.4.7" +source = "git+https://gitlab.com/tspiteri/gmp-mpfr-sys.git#21966f4bfb56c87d407eb14c72e92ef4e55856aa" dependencies = [ "libc", "winapi", diff --git a/Cargo.toml b/Cargo.toml index ed4a5eb..3b2e286 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,6 @@ +[patch.crates-io] +gmp-mpfr-sys = { git = "https://gitlab.com/tspiteri/gmp-mpfr-sys.git" } + [workspace] members = ["kalk", "cli"] diff --git a/flake.nix b/flake.nix index c28ccc3..7f175ed 100644 --- a/flake.nix +++ b/flake.nix @@ -21,15 +21,19 @@ src = self; - nativeBuildInputs = with final; [ gcc ]; - outputs = [ "out" "lib" ]; postInstall = '' moveToOutput "lib" "$lib" ''; - cargoLock = { lockFile = self + "/Cargo.lock"; }; + cargoLock = { + lockFile = self + "/Cargo.lock"; + outputHashes = { + "gmp-mpfr-sys-1.4.7" = + "sha256-zHpGbEgh3MgAUVdlWrXq4Clj1boybi6DMOcsjgZbAh0="; + }; + }; buildInputs = with final; [ gmp mpfr libmpc ];