Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f14628e576d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f964c1468ee6
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 4, 2019

  1. monero-gui: only exclude darwin in meta.platforms

    @rnhmjoj
    rnhmjoj committed Jul 4, 2019
    Copy the full SHA
    7b3ecfb View commit details

Commits on Jul 6, 2019

  1. monero-gui: remove unecessary patches

    @rnhmjoj
    rnhmjoj committed Jul 6, 2019
    Copy the full SHA
    032b0e6 View commit details

Commits on Aug 9, 2019

  1. Merge pull request #64305 from rnhmjoj/monero 

    monero-gui: only exclude darwin in meta.platforms
    @mmahut
    mmahut authored Aug 9, 2019
    Copy the full SHA
    f964c14 View commit details
16 changes: 6 additions & 10 deletions pkgs/applications/altcoins/monero-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 15 deletions pkgs/applications/altcoins/monero-gui/move-log-file.patch
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 13 deletions pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
View file

This file was deleted.