git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130317 from SuperSandro2000/monero

monero: cleanup

commitcc72326a734a2705b009dd6f6ff527775dc7075d authorPavol Rusnak <pavol@rusnak.io> dateFri 16 Jul 2021, 01:39 (5 years ago) parentf641b663d3d8a1
2 files changed+9−22
compare with master
unifiedsplit
pkgs/applications/blockchains/monero-gui/default.nix+5−10 pkgs/applications/blockchains/monero/default.nix+4−12
pkgs/applications/blockchains/monero-gui/default.nix+5−10
@@ -9,14 +9,9 @@
99, boost, libunwind, libsodium, pcsclite
1010, randomx, zeromq, libgcrypt, libgpgerror
1111, hidapi, rapidjson, quirc
12−, trezorSupport ? true
13−, libusb1
14−, protobuf
15−, python3
12+, trezorSupport ? true, libusb1, protobuf, python3
1613}:
1714
18−with lib;
19−
2015stdenv.mkDerivation rec {
2116 pname = "monero-gui";
2217 version = "0.17.2.2";
@@ -30,7 +25,7 @@ stdenv.mkDerivation rec {
3025
3126 nativeBuildInputs = [
3227 cmake pkg-config wrapQtAppsHook
33− (getDev qttools)
28+ (lib.getDev qttools)
3429 ];
3530
3631 buildInputs = [
@@ -41,8 +36,8 @@ stdenv.mkDerivation rec {
4136 randomx libgcrypt libgpgerror
4237 boost libunwind libsodium pcsclite
4338 zeromq hidapi rapidjson quirc
44− ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]
45− ++ optionals stdenv.isDarwin [ qtmacextras ];
39+ ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]
40+ ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
4641
4742 postUnpack = ''
4843 # copy monero sources here
@@ -98,7 +93,7 @@ stdenv.mkDerivation rec {
9893 done;
9994 '';
10095
101− meta = {
96+ meta = with lib; {
10297 description = "Private, secure, untraceable currency";
10398 homepage = "https://getmonero.org/";
10499 license = licenses.bsd3;
pkgs/applications/blockchains/monero/default.nix+4−12
@@ -4,17 +4,9 @@
44, zeromq, pcsclite, readline, libsodium, hidapi
55, randomx, rapidjson
66, CoreData, IOKit, PCSC
7−, trezorSupport ? true
8−, libusb1 ? null
9−, protobuf ? null
10−, python3 ? null
7+, trezorSupport ? true, libusb1, protobuf, python3
118}:
129
13−with lib;
14−
15−assert stdenv.isDarwin -> IOKit != null;
16−assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
17−
1810stdenv.mkDerivation rec {
1911 pname = "monero";
2012 version = "0.17.2.0";
@@ -45,8 +37,8 @@ stdenv.mkDerivation rec {
4537 zeromq pcsclite readline
4638 libsodium hidapi randomx rapidjson
4739 protobuf
48− ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
49− ++ optionals trezorSupport [ libusb1 protobuf python3 ];
40+ ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
41+ ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
5042
5143 cmakeFlags = [
5244 "-DCMAKE_BUILD_TYPE=Release"
@@ -54,7 +46,7 @@ stdenv.mkDerivation rec {
5446 "-DBUILD_GUI_DEPS=ON"
5547 "-DReadline_ROOT_DIR=${readline.dev}"
5648 "-DRandomX_ROOT_DIR=${randomx}"
57− ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
49+ ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
5850
5951 outputs = [ "out" "source" ];
6052