nano-wallet: 20.0 -> 21.3 (#116780)

authored by Jaakko Luttinen and committed by GitHub 96a4b2a1 1220a71f

+10 -29
-13
pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
··· 1 - diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index b43f02f6..4470abbf 100644 3 - --- a/CMakeLists.txt 4 - +++ b/CMakeLists.txt 5 - @@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC) 6 - 7 - include_directories (${CMAKE_SOURCE_DIR}) 8 - 9 - -set(Boost_USE_STATIC_LIBS ON) 10 - +add_definitions(-DBOOST_LOG_DYN_LINK) 11 - set(Boost_USE_MULTITHREADED ON) 12 - 13 - if (BOOST_CUSTOM)
···
+10 -16
pkgs/applications/blockchains/nano-wallet/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL 2 - , qtbase}: 3 4 stdenv.mkDerivation rec { 5 6 pname = "nano-wallet"; 7 - version = "20.0"; 8 9 src = fetchFromGitHub { 10 owner = "nanocurrency"; 11 - repo = "raiblocks"; 12 rev = "V${version}"; 13 - sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn"; 14 fetchSubmodules = true; 15 }; 16 - 17 - # Use a patch to force dynamic linking 18 - patches = [ 19 - ./CMakeLists.txt.patch 20 - ]; 21 22 cmakeFlags = let 23 options = { 24 BOOST_ROOT = boost; 25 - Boost_USE_STATIC_LIBS = "OFF"; 26 RAIBLOCKS_GUI = "ON"; 27 RAIBLOCKS_TEST = "ON"; 28 Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; ··· 37 buildInputs = [ boost libGL qtbase ]; 38 39 buildPhase = '' 40 make nano_wallet 41 - ''; 42 - 43 - # Move executables under bin directory 44 - postInstall = '' 45 - mkdir -p $out/bin 46 - mv $out/nano* $out/bin/ 47 ''; 48 49 checkPhase = '' 50 ./core_test 51 ''; 52 53 meta = {
··· 1 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL 2 + , qtbase, python }: 3 4 stdenv.mkDerivation rec { 5 6 pname = "nano-wallet"; 7 + version = "21.3"; 8 9 src = fetchFromGitHub { 10 owner = "nanocurrency"; 11 + repo = "nano-node"; 12 rev = "V${version}"; 13 + sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm"; 14 fetchSubmodules = true; 15 }; 16 17 cmakeFlags = let 18 options = { 19 + PYTHON_EXECUTABLE = "${python}/bin/python"; 20 + NANO_SHARED_BOOST = "ON"; 21 BOOST_ROOT = boost; 22 RAIBLOCKS_GUI = "ON"; 23 RAIBLOCKS_TEST = "ON"; 24 Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; ··· 33 buildInputs = [ boost libGL qtbase ]; 34 35 buildPhase = '' 36 + runHook preBuild 37 make nano_wallet 38 + runHook postBuild 39 ''; 40 41 checkPhase = '' 42 + runHook preCheck 43 ./core_test 44 + runHook postCheck 45 ''; 46 47 meta = {