monero: use latest protobuf

This commit is contained in:
Pavol Rusnak 2020-06-22 00:39:40 +02:00
parent 5aa7c0c825
commit c09f880fc3
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 2 additions and 4 deletions

View File

@ -2,7 +2,7 @@
, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1
, protobuf, randomx, rapidjson, libusb-compat-0_1
, CoreData, IOKit, PCSC
}:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
boost miniupnpc openssl unbound
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
pythonProtobuf libusb-compat-0_1
protobuf libusb-compat-0_1
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [

View File

@ -23772,12 +23772,10 @@ in
monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost17x;
pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; };
};
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
boost = boost17x;
protobuf = protobuf3_10;
};
masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; };