public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100815 from rnhmjoj/monero

Browse Source 
monero: 0.17.0.1 -> 0.17.1.0
This commit is contained in:
Michele Guerini Rocco 2020-10-17 15:14:24 +02:00 committed by GitHub
commit 54de950dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,13 +27,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.17.0.1"; version = "0.17.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i9a3ampppyzsl4sllbqlr3w43sjpb3fdfxhb1j4n49p8g0jzmf3"; sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -65,9 +65,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/version.js.in \ substituteInPlace src/version.js.in \
--replace '@VERSION_TAG_GUI@' '${version}' --replace '@VERSION_TAG_GUI@' '${version}'
# 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 \
--replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin'
@ -78,10 +75,11 @@ stdenv.mkDerivation rec {
'add_subdirectory(monero EXCLUDE_FROM_ALL)' 'add_subdirectory(monero EXCLUDE_FROM_ALL)'
''; '';
cmakeFlags = [ preConfigure = ''
"-DCMAKE_INSTALL_PREFIX=$out/bin" # because $out needs to be expanded
"-DARCH=${arch}" cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin")
]; cmakeFlagsArray+=("-DARCH=${arch}")
'';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "monero-wallet-gui"; name = "monero-wallet-gui";

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

@ -17,25 +17,18 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero"; pname = "monero";
version = "0.17.0.1"; version = "0.17.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero"; repo = "monero";
rev = "v${version}"; rev = "v${version}";
sha256 = "1v0phvg5ralli4dr09a60nq032xqlci5d6v4zfq8304vgrn1ffgp"; sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
./use-system-libraries.patch ./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 = ''