mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Merge pull request #64305 from rnhmjoj/monero

Browse source 
monero-gui: only exclude darwin in meta.platforms
This commit is contained in:
Marek Mahut 2019-08-09 13:12:28 +02:00 committed by GitHub
parent f14628e576 032b0e6c12
commit f964c1468e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/altcoins/monero-gui/default.nix
View file

@ -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
@ -97,10 +92,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 ];
};
}

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

@ -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

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

@ -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'",