Skip to content

Commit 5633bcf

Browse files
authored
monero-cli: update submodule version; disable aarch64-darwin (#341980)
2 parents 681afa0 + c2ec210 commit 5633bcf

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

pkgs/applications/blockchains/monero-cli/default.nix

+20-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}:
2828

2929
let
30-
# submodules
30+
# submodules; revs are taken from monero repo's `/external` at the given monero version tag.
3131
supercop = fetchFromGitHub {
3232
owner = "monero-project";
3333
repo = "supercop";
@@ -37,12 +37,11 @@ let
3737
trezor-common = fetchFromGitHub {
3838
owner = "trezor";
3939
repo = "trezor-common";
40-
rev = "bc28c316d05bf1e9ebfe3d7df1ab25831d98d168";
41-
hash = "sha256-F1Hf1WwHqXMd/5OWrdkpomszACTozDuC7DQXW3p6248=";
40+
rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0";
41+
hash = "sha256-VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI=";
4242
};
4343

4444
in
45-
4645
stdenv.mkDerivation rec {
4746
pname = "monero-cli";
4847
version = "0.18.3.4";
@@ -111,14 +110,28 @@ stdenv.mkDerivation rec {
111110
"-DCMAKE_CXX_FLAGS=-fpermissive"
112111
];
113112

114-
outputs = [ "out" "source" ];
113+
outputs = [
114+
"out"
115+
"source"
116+
];
115117

116118
meta = {
117119
description = "Private, secure, untraceable currency";
118120
homepage = "https://getmonero.org/";
119121
license = lib.licenses.bsd3;
120-
platforms = lib.platforms.all;
121-
maintainers = with lib.maintainers; [ rnhmjoj ];
122+
123+
platforms = with lib.platforms; linux;
124+
125+
# macOS/ARM has a working `monerod` (at least), but `monero-wallet-cli`
126+
# segfaults on start after entering the wallet password, when built in release mode.
127+
# Building the same revision in debug mode to root-cause the above problem doesn't work
128+
# because of https://github.com/monero-project/monero/issues/9486
129+
badPlatforms = [ "aarch64-darwin" ];
130+
131+
maintainers = with lib.maintainers; [
132+
pmw
133+
rnhmjoj
134+
];
122135
mainProgram = "monero-wallet-cli";
123136
};
124137
}

0 commit comments

Comments
 (0)