diff options
-rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index cfd3998ee3686..a135d0b3a0044 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -4,7 +4,7 @@ , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind -, libsodium, pcsclite, zeromq, cppzmq +, libsodium, pcsclite, zeromq, libgcrypt, libgpgerror , hidapi, libusb-compat-0_1, protobuf, randomx }: @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.15.0.4"; + version = "0.16.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z"; + sha256 = "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtquickcontrols2 qtxmlpatterns - monero unbound readline + monero unbound readline libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq - cppzmq hidapi libusb-compat-0_1 protobuf randomx + hidapi libusb-compat-0_1 protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { preBuild = '' sed -i s#/opt/monero-wallet-gui##g Makefile make -C src/zxcvbn-c + + # use nixpkgs monero sources + rmdir monero + ln -s "${monero.src}" monero ''; desktopItem = makeDesktopItem { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca2189b3d4666..ff5a273f2f319 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23473,7 +23473,7 @@ in }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost16x; + boost = boost17x; protobuf = protobuf3_10; }; |