monero-gui: 0.15.0.1 -> 0.15.0.4

rnhmjoj 3c93f1ba ddabb09c

+22 -24
+14 -15
pkgs/applications/blockchains/monero-gui/default.nix
··· 1 - { stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub 2 - , qtbase, qmake, qtmultimedia, qttools 3 - , qtgraphicaleffects, qtdeclarative 4 - , qtlocation, qtquickcontrols, qtquickcontrols2 5 - , qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns 1 + { stdenv, wrapQtAppsHook, makeDesktopItem 2 + , fetchFromGitHub, qmake, qttools, pkgconfig 3 + , qtbase, qtdeclarative, qtgraphicaleffects 4 + , qtmultimedia, qtxmlpatterns 5 + , qtquickcontrols, qtquickcontrols2 6 6 , monero, unbound, readline, boost, libunwind 7 - , libsodium, pcsclite, zeromq, cppzmq, pkgconfig 8 - , hidapi, randomx 7 + , libsodium, pcsclite, zeromq, cppzmq 8 + , hidapi, libusb, protobuf, randomx 9 9 }: 10 10 11 11 with stdenv.lib; 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "monero-gui"; 15 - version = "0.15.0.1"; 15 + version = "0.15.0.4"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "monero-project"; 19 19 repo = "monero-gui"; 20 20 rev = "v${version}"; 21 - sha256 = "08j8kkncdn57xql0bhmlzjpjkdfhqbpda1p07r797q8qi0nl4w8n"; 21 + sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z"; 22 22 }; 23 23 24 24 nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; 25 25 26 26 buildInputs = [ 27 - qtbase qtmultimedia qtgraphicaleffects 28 - qtdeclarative qtlocation 29 - qtquickcontrols qtquickcontrols2 30 - qtwebchannel qtwebengine qtx11extras 31 - qtxmlpatterns monero unbound readline 27 + qtbase qtdeclarative qtgraphicaleffects 28 + qtmultimedia qtquickcontrols qtquickcontrols2 29 + qtxmlpatterns 30 + monero unbound readline 32 31 boost libunwind libsodium pcsclite zeromq 33 - cppzmq hidapi randomx 32 + cppzmq hidapi libusb protobuf randomx 34 33 ]; 35 34 36 35 NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
+8 -9
pkgs/applications/blockchains/monero-gui/move-log-file.patch
··· 1 - diff --git a/main.cpp b/main.cpp 2 - index a51568d..5a9f683 100644 3 - --- a/main.cpp 4 - +++ b/main.cpp 5 - @@ -152,7 +152,9 @@ int main(int argc, char *argv[]) 1 + diff --git a/src/main/main.cpp b/src/main/main.cpp 2 + index c5210e5f..45794d72 100644 3 + --- a/src/main/main.cpp 4 + +++ b/src/main/main.cpp 5 + @@ -220,6 +220,9 @@ int main(int argc, char *argv[]) 6 6 QCommandLineOption logPathOption(QStringList() << "l" << "log-file", 7 7 QCoreApplication::translate("main", "Log to specified file"), 8 8 QCoreApplication::translate("main", "file")); 9 - - 10 9 + logPathOption.setDefaultValue( 11 10 + QStandardPaths::writableLocation(QStandardPaths::CacheLocation) 12 11 + + "/monero-wallet-gui.log"); 13 - parser.addOption(logPathOption); 14 - parser.addHelpOption(); 15 - parser.process(app); 12 + 13 + QCommandLineOption testQmlOption("test-qml"); 14 + testQmlOption.setFlags(QCommandLineOption::HiddenFromHelp);