ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-18 03:04:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #219570 from rnhmjoj/pr-monero

Browse Source 
monero-{cli,gui}: 0.18.1.2 -> 0.18.2.0
This commit is contained in:
Pavol Rusnak 2023-03-06 00:05:04 +01:00 committed by GitHub
commit c62f50e86d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/blockchains/monero-cli/default.nix
View File

@ -6,16 +6,32 @@
, trezorSupport ? true, libusb1, protobuf, python3 , trezorSupport ? true, libusb1, protobuf, python3
}: }:
let
# submodules
supercop = fetchFromGitHub {
owner = "monero-project";
repo = "supercop";
rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9";
sha256 = "26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE=";
};
trezor-common = fetchFromGitHub {
owner = "trezor";
repo = "trezor-common";
rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0";
sha256 = "VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI=";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-cli"; pname = "monero-cli";
version = "0.18.1.2"; version = "0.18.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero"; repo = "monero";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yV1ysoesEcjL+JX6hkmcrBDmazOWBvYK6EjshxJzcAw="; sha256 = "n2e5U3p0eG2atPYV86H2UAURwsIkeSOBm8iwYsDVAoc=";
fetchSubmodules = true;
}; };
patches = [ patches = [
@ -23,8 +39,10 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
# remove vendored libraries # manually install submodules
rm -r external/{miniupnp,randomx,rapidjson} rmdir external/{supercop,trezor-common}
ln -sf ${supercop} external/supercop
ln -sf ${trezor-common} external/trezor-common
# export patched source for monero-gui # export patched source for monero-gui
cp -r . $source cp -r . $source
''; '';

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

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.18.1.2"; version = "0.18.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-GBILqNkYQUkil1qvYnJTkHwgK3dzKR9I9GVbbLy/0UU="; sha256 = "Bm6OpK1jjdWVqdp6HpirqP6+3GcMSZfZ/e70wcu+rQc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [