diff options
author | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2021-03-20 21:40:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-20 20:40:52 +0100 |
commit | 96a4b2a14108b4586e2bde597ee2cd6afeef169d (patch) | |
tree | 0162a7004c55e447ce63286e12fd6d8720289744 /pkgs/applications/blockchains/nano-wallet | |
parent | 1220a71f45def9772f2433b986ba1242c33d4bcd (diff) | |
download | nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.tar nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.tar.gz nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.tar.bz2 nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.tar.lz nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.tar.xz nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.tar.zst nixpkgs-96a4b2a14108b4586e2bde597ee2cd6afeef169d.zip |
nano-wallet: 20.0 -> 21.3 (#116780)
Diffstat (limited to 'pkgs/applications/blockchains/nano-wallet')
-rw-r--r-- | pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch | 13 | ||||
-rw-r--r-- | pkgs/applications/blockchains/nano-wallet/default.nix | 26 |
2 files changed, 10 insertions, 29 deletions
diff --git a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch deleted file mode 100644 index 5bbec1d39be..00000000000 --- a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch +++ /dev/null @@ -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) diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 60ad51152f6..0e39587fabb 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,28 +1,24 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL -, qtbase}: +, qtbase, python }: stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "20.0"; + version = "21.3"; src = fetchFromGitHub { owner = "nanocurrency"; - repo = "raiblocks"; + repo = "nano-node"; rev = "V${version}"; - sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn"; + sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm"; fetchSubmodules = true; }; - # Use a patch to force dynamic linking - patches = [ - ./CMakeLists.txt.patch - ]; - cmakeFlags = let options = { + PYTHON_EXECUTABLE = "${python}/bin/python"; + NANO_SHARED_BOOST = "ON"; BOOST_ROOT = boost; - Boost_USE_STATIC_LIBS = "OFF"; RAIBLOCKS_GUI = "ON"; RAIBLOCKS_TEST = "ON"; Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; @@ -37,17 +33,15 @@ stdenv.mkDerivation rec { buildInputs = [ boost libGL qtbase ]; buildPhase = '' + runHook preBuild make nano_wallet - ''; - - # Move executables under bin directory - postInstall = '' - mkdir -p $out/bin - mv $out/nano* $out/bin/ + runHook postBuild ''; checkPhase = '' + runHook preCheck ./core_test + runHook postCheck ''; meta = { |