diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/applications/blockchains/nano-wallet | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/applications/blockchains/nano-wallet')
-rw-r--r-- | nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch | 13 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix | 26 |
2 files changed, 10 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch b/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch deleted file mode 100644 index 5bbec1d39bea..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix index 60ad51152f69..0e39587fabb3 100644 --- a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/nixpkgs/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 = { |