From 7b3ecfb6a51b95f64264c53c0e79526971dec9ae Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 4 Jul 2019 17:16:10 +0200 Subject: [PATCH 1/2] monero-gui: only exclude darwin in meta.platforms --- pkgs/applications/altcoins/monero-gui/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index d67ac0a7055..4e7eb3a1451 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -102,10 +102,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ rnhmjoj ]; + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + badPlatforms = platforms.darwin; + maintainers = with maintainers; [ rnhmjoj ]; }; } From 032b0e6c121cb00cc3d1fb797188e22f994a68da Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 7 Jul 2019 01:28:23 +0200 Subject: [PATCH 2/2] monero-gui: remove unecessary patches --- pkgs/applications/altcoins/monero-gui/default.nix | 5 ----- .../altcoins/monero-gui/move-log-file.patch | 15 --------------- .../monero-gui/move-translations-dir.patch | 13 ------------- 3 files changed, 33 deletions(-) delete mode 100644 pkgs/applications/altcoins/monero-gui/move-translations-dir.patch diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 4e7eb3a1451..f4bdce4117e 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { patches = [ ./move-log-file.patch - ./move-translations-dir.patch ]; postPatch = '' @@ -83,10 +82,6 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications - # install translations - 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 size=$n"x"$n diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 260c6d9d00f..e540f1960d6 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,18 +13,3 @@ index a51568d..5a9f683 100644 parser.addOption(logPathOption); parser.addHelpOption(); parser.process(app); -diff --git a/Logger.cpp b/Logger.cpp -index 6b1daba..c357762 100644 ---- a/Logger.cpp -+++ b/Logger.cpp -@@ -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 - - diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch deleted file mode 100644 index ff17ce5da1c..00000000000 --- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/TranslationManager.cpp b/TranslationManager.cpp -index e7fc52a..83534cc 100644 ---- a/TranslationManager.cpp -+++ b/TranslationManager.cpp -@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language) - return true; - } - -- QString dir = qApp->applicationDirPath() + "/translations"; -+ QString dir = qApp->applicationDirPath() + "/../share/translations"; - QString filename = "monero-core_" + language; - - qDebug("%s: loading translation file '%s' from '%s'",