monero: apply patch to fix monero-gui build
This is a more appropriate solution to fix a build error in monero-gui.
This commit is contained in:
parent
059292cc64
commit
b5ca332b1d
|
@ -57,8 +57,9 @@ stdenv.mkDerivation rec {
|
||||||
# set monero-gui version
|
# set monero-gui version
|
||||||
substituteInPlace src/version.js.in \
|
substituteInPlace src/version.js.in \
|
||||||
--replace '@VERSION_TAG_GUI@' '${version}'
|
--replace '@VERSION_TAG_GUI@' '${version}'
|
||||||
substituteInPlace monero/src/version.cpp.in \
|
|
||||||
--replace '@VERSION_IS_RELEASE@' 'true'
|
# remove this line on the next release
|
||||||
|
rm cmake/Version.cmake
|
||||||
|
|
||||||
# use monerod from the monero package
|
# use monerod from the monero package
|
||||||
substituteInPlace src/daemon/DaemonManager.cpp \
|
substituteInPlace src/daemon/DaemonManager.cpp \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub
|
{ stdenv, fetchFromGitHub, fetchpatch
|
||||||
, cmake, pkgconfig
|
, cmake, pkgconfig
|
||||||
, boost, miniupnpc, openssl, unbound
|
, boost, miniupnpc, openssl, unbound
|
||||||
, zeromq, pcsclite, readline, libsodium, hidapi
|
, zeromq, pcsclite, readline, libsodium, hidapi
|
||||||
|
@ -27,7 +27,16 @@ stdenv.mkDerivation rec {
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./use-system-libraries.patch ];
|
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 = ''
|
postPatch = ''
|
||||||
# remove vendored libraries
|
# remove vendored libraries
|
||||||
|
|
Loading…
Reference in New Issue