Merge pull request #46033 from rnhmjoj/monero

Monero updates

pkgs/applications/altcoins/monero-gui/default.nix

@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "monero-gui-${version}";
-  version = "0.12.0.0";
+  version = "0.12.3.0";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl";
+    sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];
@@ -70,7 +70,8 @@ stdenv.mkDerivation rec {
     cp ${desktopItem}/share/applications/* $out/share/applications
 
     # install translations
-    cp -r release/bin/translations $out/share/
+    mkdir -p $out/share/translations
+    cp translations/*.qm $out/share/translations/
 
     # install icons
     for n in 16 24 32 48 64 96 128 256; do

pkgs/applications/altcoins/monero-gui/move-log-file.patch

@@ -1,38 +1,27 @@
 diff --git a/main.cpp b/main.cpp
-index c03b160..a8ea263 100644
+index 79223c0..e80b317 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -80,14 +80,16 @@ int main(int argc, char *argv[])
+@@ -115,6 +115,9 @@ int main(int argc, char *argv[])
- //    qDebug() << "High DPI auto scaling - enabled";
+     QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
- //#endif
+         QCoreApplication::translate("main", "Log to specified file"),
- 
+         QCoreApplication::translate("main", "file"));
--    // Log settings
++    logPathOption.setDefaultValue(
--    Monero::Wallet::init(argv[0], "monero-wallet-gui");
++        QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
--//    qInstallMessageHandler(messageHandler);
++        + "/monero-wallet-gui.log");
--
+     parser.addOption(logPathOption);
-     MainApp app(argc, argv);
+     parser.addHelpOption();
- 
+     parser.process(app);
-     qDebug() << "app startd";
+diff --git a/Logger.cpp b/Logger.cpp
- 
+index 660bafc..dae24d4 100644
-+    // Log settings
+--- a/Logger.cpp
-+    QString logfile =
++++ b/Logger.cpp
-+      QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
+@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
-+      + "/monero-wallet-gui.log";
+ #elif defined(Q_OS_MAC)
-+    Monero::Wallet::init(argv[0], logfile.toUtf8().constData());
+     static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
-+
+ #else // linux + bsd
-     app.setApplicationName("monero-core");
+-    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
-     app.setOrganizationDomain("getmonero.org");
++    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
-     app.setOrganizationName("monero-project");
-diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
-index 74649ce..fe1efc6 100644
---- a/src/libwalletqt/Wallet.cpp
-+++ b/src/libwalletqt/Wallet.cpp
-@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const
- #ifdef Q_OS_MACOS
-     return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename;
- #else
--    return QCoreApplication::applicationDirPath() + "/" + filename;
-+    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename;
  #endif
- }
+ 
  

pkgs/applications/altcoins/monero-gui/move-translations-dir.patch

@@ -1,14 +1,13 @@
 diff --git a/TranslationManager.cpp b/TranslationManager.cpp
-index fa39d35..5a410f7 100644
+index e7fc52a..83534cc 100644
 --- a/TranslationManager.cpp
 +++ b/TranslationManager.cpp
-@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language)
+@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language)
- #ifdef Q_OS_MACX
+         return true;
-     QString dir = qApp->applicationDirPath() + "/../Resources/translations";
+     }
- #else
+ 
 -    QString dir = qApp->applicationDirPath() + "/translations";
 +    QString dir = qApp->applicationDirPath() + "/../share/translations";
- #endif
- 
      QString filename = "monero-core_" + language;
-
+ 
+     qDebug("%s: loading translation file '%s' from '%s'",

pkgs/applications/altcoins/monero/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchgit
 , cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline
@@ -11,25 +11,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.12.0.0";
+  version = "0.12.3.0";
 
-  src = fetchFromGitHub {
+  src = fetchgit {
-    owner  = "monero-project";
+    url    = "https://github.com/monero-project/monero.git";
-    repo   = "monero";
     rev    = "v${version}";
-    sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
+    sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git ];
 
-  patches = [
-    # fix daemon crash, remove with 0.12.1.0 update
-    (fetchpatch {
-      url    = "https://github.com/monero-project/monero/commit/08343ab.diff";
-      sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
-    })
-  ];
-
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
@@ -39,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBUILD_GUI_DEPS=ON"
     "-DReadline_ROOT_DIR=${readline.dev}"
-  ];
+  ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
 
   hardeningDisable = [ "fortify" ];