ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

monero: apply patch to fix monero-gui build

Browse Source 
This is a more appropriate solution to fix a
build error in monero-gui.
This commit is contained in:
rnhmjoj 2020-10-08 01:12:31 +02:00
parent 059292cc64
commit b5ca332b1d
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -57,8 +57,9 @@ stdenv.mkDerivation rec {
# set monero-gui version
substituteInPlace src/version.js.in \
--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
substituteInPlace src/daemon/DaemonManager.cpp \

13
pkgs/applications/blockchains/monero/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ stdenv, fetchFromGitHub, fetchpatch
, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
@ -27,7 +27,16 @@ stdenv.mkDerivation rec {
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 = ''
# remove vendored libraries