nano-wallet: 20.0 -> 21.3 (#116780)
This commit is contained in:
parent
1220a71f45
commit
96a4b2a141
@ -1,13 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index b43f02f6..4470abbf 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC)
|
|
||||||
|
|
||||||
include_directories (${CMAKE_SOURCE_DIR})
|
|
||||||
|
|
||||||
-set(Boost_USE_STATIC_LIBS ON)
|
|
||||||
+add_definitions(-DBOOST_LOG_DYN_LINK)
|
|
||||||
set(Boost_USE_MULTITHREADED ON)
|
|
||||||
|
|
||||||
if (BOOST_CUSTOM)
|
|
@ -1,28 +1,24 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
|
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
|
||||||
, qtbase}:
|
, qtbase, python }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
pname = "nano-wallet";
|
pname = "nano-wallet";
|
||||||
version = "20.0";
|
version = "21.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nanocurrency";
|
owner = "nanocurrency";
|
||||||
repo = "raiblocks";
|
repo = "nano-node";
|
||||||
rev = "V${version}";
|
rev = "V${version}";
|
||||||
sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn";
|
sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use a patch to force dynamic linking
|
|
||||||
patches = [
|
|
||||||
./CMakeLists.txt.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = let
|
cmakeFlags = let
|
||||||
options = {
|
options = {
|
||||||
|
PYTHON_EXECUTABLE = "${python}/bin/python";
|
||||||
|
NANO_SHARED_BOOST = "ON";
|
||||||
BOOST_ROOT = boost;
|
BOOST_ROOT = boost;
|
||||||
Boost_USE_STATIC_LIBS = "OFF";
|
|
||||||
RAIBLOCKS_GUI = "ON";
|
RAIBLOCKS_GUI = "ON";
|
||||||
RAIBLOCKS_TEST = "ON";
|
RAIBLOCKS_TEST = "ON";
|
||||||
Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
|
Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
|
||||||
@ -37,17 +33,15 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [ boost libGL qtbase ];
|
buildInputs = [ boost libGL qtbase ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
make nano_wallet
|
make nano_wallet
|
||||||
'';
|
runHook postBuild
|
||||||
|
|
||||||
# Move executables under bin directory
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
mv $out/nano* $out/bin/
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
./core_test
|
./core_test
|
||||||
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user