diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 776d51ca6bd8..c079fa88a703 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.0.1"; + version = "0.17.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1i9a3ampppyzsl4sllbqlr3w43sjpb3fdfxhb1j4n49p8g0jzmf3"; + sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84"; }; nativeBuildInputs = [ @@ -65,9 +65,6 @@ stdenv.mkDerivation rec { substituteInPlace src/version.js.in \ --replace '@VERSION_TAG_GUI@' '${version}' - # remove this line on the next release - rm cmake/Version.cmake - # use monerod from the monero package substituteInPlace src/daemon/DaemonManager.cpp \ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' @@ -78,10 +75,11 @@ stdenv.mkDerivation rec { 'add_subdirectory(monero EXCLUDE_FROM_ALL)' ''; - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=$out/bin" - "-DARCH=${arch}" - ]; + preConfigure = '' + # because $out needs to be expanded + cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin") + cmakeFlagsArray+=("-DARCH=${arch}") + ''; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 935040bc7bb5..7d55a5f6f34c 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,25 +17,18 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.0.1"; + version = "0.17.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1v0phvg5ralli4dr09a60nq032xqlci5d6v4zfq8304vgrn1ffgp"; + sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw"; fetchSubmodules = true; }; patches = [ ./use-system-libraries.patch - - # This fixes a bug in the monero-gui build system, - # remove it once the PR has been merged - (fetchpatch { - url = "https://github.com/monero-project/monero/pull/6867.patch"; - sha256 = "0nxa6861df1fadrm9bmhqf2g6mljgr4jndsbxqp7g501hv9z51j3"; - }) ]; postPatch = ''