monero-gui: 0.15.0.4 -> 0.16.0.0

This commit is contained in:
rnhmjoj 2020-06-18 23:41:46 +02:00
parent a31103196e
commit 7c041738c8
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 10 additions and 6 deletions

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 {

View File

@ -23473,7 +23473,7 @@ in
}; };
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;
}; };