Merge pull request #64263 from rnhmjoj/monero

monero: 0.14.0 -> 0.14.1
This commit is contained in:
Franz Pletz 2019-07-03 23:08:38 +00:00 committed by GitHub
commit 74049dfd5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions

View file

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
version = "0.14.0.0";
version = "0.14.1.0";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8";
sha256 = "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31";
};
nativeBuildInputs = [ qmake pkgconfig ];

View file

@ -1,11 +1,12 @@
diff --git a/main.cpp b/main.cpp
index 79223c0..e80b317 100644
index a51568d..5a9f683 100644
--- a/main.cpp
+++ b/main.cpp
@@ -115,6 +115,9 @@ int main(int argc, char *argv[])
@@ -152,7 +152,9 @@ int main(int argc, char *argv[])
QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
QCoreApplication::translate("main", "Log to specified file"),
QCoreApplication::translate("main", "file"));
-
+ logPathOption.setDefaultValue(
+ QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
+ + "/monero-wallet-gui.log");

View file

@ -11,12 +11,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "monero-${version}";
version = "0.14.0.2";
version = "0.14.1.0";
src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k";
sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh";
};
nativeBuildInputs = [ cmake pkgconfig git ];

View file

@ -19097,11 +19097,11 @@ in
monero = callPackage ../applications/altcoins/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost15x;
boost = boost16x;
};
monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui {
boost = boost15x;
boost = boost16x;
};
xmr-stak = callPackage ../applications/misc/xmr-stak {