public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monero: use a compatible protobuf version

Browse Source
This commit is contained in:
rnhmjoj 2020-03-22 03:34:54 +01:00
parent e28f291d3c
commit ddabb09c35
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/monero/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

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