Merge pull request #197628 from centromere/zcash-5.3.0
zcash: 5.1.0 -> 5.3.0
This commit is contained in:
commit
87ea45c91b
@ -1,17 +1,17 @@
|
|||||||
{ autoreconfHook, boost179, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
|
{ autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
|
||||||
, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform, pkg-config
|
, hexdump, hostPlatform, lib, libevent, libsodium, makeWrapper, rust, rustPlatform
|
||||||
, stdenv, testers, utf8cpp, util-linux, zcash, zeromq
|
, pkg-config, Security, stdenv, testers, utf8cpp, util-linux, zcash, zeromq
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
||||||
pname = "zcash";
|
pname = "zcash";
|
||||||
version = "5.1.0";
|
version = "5.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zcash";
|
owner = "zcash";
|
||||||
repo = "zcash";
|
repo = "zcash";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-tU6DuWpe8Vlx0qIilAKWuO7WFp1ucbxtvOxoWLA0gdc=";
|
hash = "sha256-mlABKZDYYC3y+KlXQVFqdcm46m8K9tbOCqk4lM4shp8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = lib.optionalString stdenv.isAarch64 ''
|
prePatch = lib.optionalString stdenv.isAarch64 ''
|
||||||
@ -20,15 +20,20 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
|||||||
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
|
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [
|
cargoHash = "sha256-6uhtOaBsgMw59Dy6yivZYUEWDsYfpInA7VmJrqxDS/4=";
|
||||||
./patches/fix-missing-header.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
cargoSha256 = "sha256-ZWmkveDEENdXRirGmnUWSjtPNJvX0Jpgfxhzk44F7Q0=";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook cargo cxx-rs hexdump makeWrapper pkg-config ];
|
nativeBuildInputs = [ autoreconfHook cargo cxx-rs hexdump makeWrapper pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ boost179 db62 libevent libsodium utf8cpp zeromq ];
|
buildInputs = [
|
||||||
|
boost180
|
||||||
|
db62
|
||||||
|
libevent
|
||||||
|
libsodium
|
||||||
|
utf8cpp
|
||||||
|
zeromq
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
Security
|
||||||
|
];
|
||||||
|
|
||||||
# Use the stdenv default phases (./configure; make) instead of the
|
# Use the stdenv default phases (./configure; make) instead of the
|
||||||
# ones from buildRustPackage.
|
# ones from buildRustPackage.
|
||||||
@ -50,7 +55,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-tests"
|
"--disable-tests"
|
||||||
"--with-boost-libdir=${lib.getLib boost179}/lib"
|
"--with-boost-libdir=${lib.getLib boost180}/lib"
|
||||||
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
|
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -75,5 +80,8 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
|||||||
homepage = "https://z.cash/";
|
homepage = "https://z.cash/";
|
||||||
maintainers = with maintainers; [ rht tkerber centromere ];
|
maintainers = with maintainers; [ rht tkerber centromere ];
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
|
||||||
|
# https://github.com/zcash/zcash/issues/4405
|
||||||
|
broken = hostPlatform.isAarch64 && hostPlatform.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
--- a/src/uint256.h 2022-07-20 10:07:39.191319302 +0000
|
|
||||||
+++ b/src/uint256.h 2022-07-20 10:07:11.809632293 +0000
|
|
||||||
@@ -7,6 +7,7 @@
|
|
||||||
#ifndef BITCOIN_UINT256_H
|
|
||||||
#define BITCOIN_UINT256_H
|
|
||||||
|
|
||||||
+#include <array>
|
|
||||||
#include <assert.h>
|
|
||||||
#include <cstring>
|
|
||||||
#include <stdexcept>
|
|
@ -33525,7 +33525,8 @@ with pkgs;
|
|||||||
};
|
};
|
||||||
|
|
||||||
zcash = callPackage ../applications/blockchains/zcash {
|
zcash = callPackage ../applications/blockchains/zcash {
|
||||||
stdenv = if stdenv.isDarwin then stdenv else llvmPackages_13.stdenv;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
|
stdenv = llvmPackages_14.stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { };
|
zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { };
|
||||||
|
Loading…
Reference in New Issue
Block a user