Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

monero: 0.1.17.8 -> 0.1.17.9 #109026

Merged
merged 2 commits into from Jan 11, 2021
Merged

monero: 0.1.17.8 -> 0.1.17.9 #109026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b29ae5
monero: 0.17.1.8 -> 0.17.1.9
rnhmjoj Jan 10, 2021
bb3b833
monero-gui: 0.17.1.8 -> 0.17.1.9
rnhmjoj Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkgs/applications/blockchains/monero-gui/default.nix
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
, monero, miniupnpc, unbound, readline
, boost, libunwind, libsodium, pcsclite
, randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson
, hidapi, rapidjson, quirc
, trezorSupport ? true
, libusb1 ? null
, protobuf ? null
Expand All @@ -28,13 +28,13 @@ in

stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.17.1.8";
version = "0.17.1.9";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "13cjrfdkr7c2ff8j2rg8hvhlc00af38vcs67wlx2109i2baq4pp3";
sha256 = "0143mmxk0jfb5pmjlx6v0knvf8v49kmkpjxlp6rw8lwnlf71xadn";
};

nativeBuildInputs = [
Expand All @@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
monero miniupnpc unbound readline
randomx libgcrypt libgpgerror
boost libunwind libsodium pcsclite
zeromq hidapi rapidjson
zeromq hidapi rapidjson quirc
] ++ optionals trezorSupport [ libusb1 protobuf python3 ]
++ optionals stdenv.isDarwin [ qtmacextras ];

Expand All @@ -75,6 +75,10 @@ stdenv.mkDerivation rec {
substituteInPlace CMakeLists.txt \
--replace 'add_subdirectory(monero)' \
'add_subdirectory(monero EXCLUDE_FROM_ALL)'

# use nixpkgs quirc
substituteInPlace CMakeLists.txt \
--replace 'add_subdirectory(external)' ""
'';

cmakeFlags = [ "-DARCH=${arch}" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/monero/default.nix
View file
Open in desktop
Expand Up @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];

stdenv.mkDerivation rec {
pname = "monero";
version = "0.17.1.8";
version = "0.17.1.9";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
sha256 = "10blazbk1602slx3wrmw4jfgkdry55iclrhm5drdficc5v3h735g";
sha256 = "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy";
fetchSubmodules = true;
};

Expand Down