From 9c2efe92028eb748d789dc3ca401e9698deeb06e Mon Sep 17 00:00:00 2001 From: David Meister Date: Mon, 25 Mar 2019 21:07:52 +1100 Subject: [PATCH 1/3] monero: 0.13.0.4 -> 0.14.0.2 (cherry picked from commit a0a1dc0a5506f5bd441c52d6e17c819c7a1465ad) --- pkgs/applications/altcoins/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 3a962458632e..94c277f63eb0 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.4"; + version = "0.14.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d"; + sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; }; nativeBuildInputs = [ cmake pkgconfig git ]; From d568a72aa6446c8bc5508eaadeffaf7bccf04720 Mon Sep 17 00:00:00 2001 From: David Meister Date: Mon, 25 Mar 2019 21:10:23 +1100 Subject: [PATCH 2/3] monero-gui: 0.13.0.4 -> 0.14.0.0 (cherry picked from commit b1d040b39be72dffcece0ed02a665b600fa6c541) --- pkgs/applications/altcoins/monero-gui/default.nix | 4 ++-- .../altcoins/monero-gui/move-log-file.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 331ef6b92a4f..fdfc350961c7 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.4"; + version = "0.14.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw"; + sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 74f817d81350..ae733151622d 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,15 +13,17 @@ index 79223c0..e80b317 100644 parser.addHelpOption(); parser.process(app); diff --git a/Logger.cpp b/Logger.cpp -index 660bafc..dae24d4 100644 +index 6b1daba..c357762 100644 --- a/Logger.cpp +++ b/Logger.cpp -@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; - #elif defined(Q_OS_MAC) - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; +@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log"; + static const QString appFolder = "Library/Logs"; #else // linux + bsd + //HomeLocation = "~" - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); +- static const QString appFolder = ".bitmonero"; + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); ++ static const QString appFolder = "bitmonero"; #endif - + From ebe9fc23aac13853322f55e41d18e98bc5d81e6e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 19 Mar 2019 22:42:02 +0100 Subject: [PATCH 3/3] monero-gui: fix missing qml imports (cherry picked from commit bbefa951e706823b3455f02d4ef4e071d669244a) --- .../altcoins/monero-gui/default.nix | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index fdfc350961c7..f597d6b6527c 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -2,8 +2,8 @@ , makeWrapper, makeDesktopItem , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols2, qtwebchannel -, qtwebengine, qtx11extras, qtxmlpatterns +, qtlocation, qtquickcontrols, qtquickcontrols2 +, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq, pkgconfig , hidapi @@ -11,6 +11,18 @@ with stdenv.lib; +let + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + qml2ImportPath = concatMapStringsSep ":" qmlPath [ + qtbase.bin qtmultimedia.bin qtgraphicaleffects + qtdeclarative.bin qtlocation.bin + qtquickcontrols qtquickcontrols2.bin + qtwebchannel.bin qtwebengine.bin qtxmlpatterns + ]; + +in + stdenv.mkDerivation rec { name = "monero-gui-${version}"; version = "0.14.0.0"; @@ -26,7 +38,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation qtquickcontrols2 + qtdeclarative qtlocation + qtquickcontrols qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq @@ -81,6 +94,11 @@ stdenv.mkDerivation rec { cp $src/images/appicons/$size.png \ $out/share/icons/hicolor/$size/apps/monero.png done; + + # wrap runtime dependencies + wrapProgram $out/bin/monero-wallet-gui \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" \ + --set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}" ''; meta = {