diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2020-11-14 19:34:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 19:34:28 +0100 |
| commit | e43e173ae129b584a5de74bd8683c939062e2b4e (patch) | |
| tree | c02afc35abf19b32a7a4c85a252d02e5789969c1 /pkgs/applications/blockchains | |
| parent | d7491cea3d197bc9e5dde67f9b158fa20adc589c (diff) | |
| parent | 52ee36a710695c299598ac9901b018a2d6bce147 (diff) | |
Merge pull request #103208 from prusnak/monero
monero: 0.17.1.1 -> 0.17.1.3
Diffstat (limited to 'pkgs/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/blockchains/monero/default.nix | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 8cd03f34286f..6275a26118f6 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,6 @@ { stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub +, fetchpatch , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.1"; + version = "0.17.1.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx"; + sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"; }; nativeBuildInputs = [ @@ -58,7 +59,14 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ ./move-log-file.patch ]; + patches = [ + ./move-log-file.patch + # fix build failure due to invalid use of CMAKE_PREFIX_PATH + (fetchpatch { + url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch"; + sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5"; + }) + ]; postPatch = '' # set monero-gui version diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 29acbd0f37b3..1010da81da34 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.1"; + version = "0.17.1.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp"; + sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j"; fetchSubmodules = true; }; |