git.iko.soy/typeable/nixpkgs
on master help sign in
monero: apply patch to fix monero-gui build

This is a more appropriate solution to fix a build error in monero-gui.

commitb5ca332b1db0e3bfcb1bdc119b37e2500ec8259b authorrnhmjoj <rnhmjoj@inventati.org> dateThu 8 Oct 2020, 01:12 (6 years ago) parent059292c
2 files changed+14−4
pkgs/applications/blockchains/monero-gui/default.nix+3−2 pkgs/applications/blockchains/monero/default.nix+11−2
pkgs/applications/blockchains/monero-gui/default.nix+3−2
@@ -57,8 +57,9 @@ stdenv.mkDerivation rec {
5757 # set monero-gui version
5858 substituteInPlace src/version.js.in \
5959 --replace '@VERSION_TAG_GUI@' '${version}'
60− substituteInPlace monero/src/version.cpp.in \
61− --replace '@VERSION_IS_RELEASE@' 'true'
60+
61+ # remove this line on the next release
62+ rm cmake/Version.cmake
6263
6364 # use monerod from the monero package
6465 substituteInPlace src/daemon/DaemonManager.cpp \
pkgs/applications/blockchains/monero/default.nix+11−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub
1+{ stdenv, fetchFromGitHub, fetchpatch
22, cmake, pkgconfig
33, boost, miniupnpc, openssl, unbound
44, zeromq, pcsclite, readline, libsodium, hidapi
@@ -27,7 +27,16 @@ stdenv.mkDerivation rec {
2727 fetchSubmodules = true;
2828 };
2929
30− patches = [ ./use-system-libraries.patch ];
30+ patches = [
31+ ./use-system-libraries.patch
32+
33+ # This fixes a bug in the monero-gui build system,
34+ # remove it once the PR has been merged
35+ (fetchpatch {
36+ url = "https://github.com/monero-project/monero/pull/6867.patch";
37+ sha256 = "0nxa6861df1fadrm9bmhqf2g6mljgr4jndsbxqp7g501hv9z51j3";
38+ })
39+ ];
3140
3241 postPatch = ''
3342 # remove vendored libraries