From e38a36094b7807813a50482e7ec0133d676e430b Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 8 Sep 2019 16:01:03 +0300 Subject: [PATCH 1/2] nano-wallet: 18.0 -> 19.0 --- pkgs/applications/blockchains/nano-wallet/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index a8d29ae149d9..4aaaabe64496 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; + sha256 = "1y5fc4cvfqh33imjkh91sqhy5bb9kh0icwyvdgm1cl564vnjax80"; fetchSubmodules = true; }; @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { make nano_wallet ''; + # Move executables under bin directory + postInstall = '' + mkdir -p $out/bin + mv $out/nano* $out/bin/ + ''; + checkPhase = '' ./core_test ''; From fa0b1870d11505f3747ff48489f0a26576734f73 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 8 Sep 2019 19:41:05 +0300 Subject: [PATCH 2/2] nano-wallet: fix Qt wrapping --- pkgs/applications/blockchains/nano-wallet/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 4aaaabe64496..5b8b17232b90 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL +, qtbase}: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { optionToFlag = name: value: "-D${name}=${value}"; in lib.mapAttrsToList optionToFlag options; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; buildPhase = ''