cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #91067 from rnhmjoj/monero

Browse source 
monero: 0.15 -> 0.16
This commit is contained in:
Michele Guerini Rocco 2020-06-19 09:12:42 +02:00 committed by GitHub
commit 8e83855f5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/blockchains/monero-gui/default.nix
View file

@ -4,7 +4,7 @@
, qtmultimedia, qtxmlpatterns , qtmultimedia, qtxmlpatterns
, qtquickcontrols, qtquickcontrols2 , qtquickcontrols, qtquickcontrols2
, monero, unbound, readline, boost, libunwind , monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq , libsodium, pcsclite, zeromq, libgcrypt, libgpgerror
, hidapi, libusb-compat-0_1, protobuf, randomx , hidapi, libusb-compat-0_1, protobuf, randomx
}: }:
@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.15.0.4"; version = "0.16.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z"; sha256 = "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld";
}; };
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
qtbase qtdeclarative qtgraphicaleffects qtbase qtdeclarative qtgraphicaleffects
qtmultimedia qtquickcontrols qtquickcontrols2 qtmultimedia qtquickcontrols qtquickcontrols2
qtxmlpatterns qtxmlpatterns
monero unbound readline monero unbound readline libgcrypt libgpgerror
boost libunwind libsodium pcsclite zeromq boost libunwind libsodium pcsclite zeromq
cppzmq hidapi libusb-compat-0_1 protobuf randomx hidapi libusb-compat-0_1 protobuf randomx
]; ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
@ -52,6 +52,10 @@ stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
sed -i s#/opt/monero-wallet-gui##g Makefile sed -i s#/opt/monero-wallet-gui##g Makefile
make -C src/zxcvbn-c make -C src/zxcvbn-c
# use nixpkgs monero sources
rmdir monero
ln -s "${monero.src}" monero
''; '';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {

9
pkgs/applications/blockchains/monero/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, cmake, pkgconfig , cmake, pkgconfig
, boost, miniupnpc, openssl, unbound, cppzmq , boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi , zeromq, pcsclite, readline, libsodium, hidapi
, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 , pythonProtobuf, randomx, rapidjson, libusb-compat-0_1
, CoreData, IOKit, PCSC , CoreData, IOKit, PCSC
@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero"; pname = "monero";
version = "0.15.0.1"; version = "0.16.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero"; repo = "monero";
rev = "v${version}"; rev = "v${version}";
sha256 = "0sypa235lf2bbib4b71xpaw39h9304slgsvnsz8wmy9fq1zx009m"; sha256 = "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost miniupnpc openssl unbound boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline zeromq pcsclite readline
libsodium hidapi randomx rapidjson libsodium hidapi randomx rapidjson
pythonProtobuf libusb-compat-0_1 pythonProtobuf libusb-compat-0_1
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
"-DUSE_DEVICE_TREZOR=ON"
"-DBUILD_GUI_DEPS=ON" "-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}" "-DReadline_ROOT_DIR=${readline.dev}"
] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; ] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";

3
pkgs/top-level/all-packages.nix
View file

@ -23465,11 +23465,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;
boost = boost17x;
pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; }; 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 = boost17x;
protobuf = protobuf3_10; protobuf = protobuf3_10;
}; };