From a38a16419645446b984d40326e12bd05c93b1f04 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 7 Jun 2023 22:03:50 +0300 Subject: [PATCH] masari: unpin boost174 --- pkgs/applications/blockchains/masari/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/masari/default.nix b/pkgs/applications/blockchains/masari/default.nix index 39735e6ddf07..27bf5a0aad16 100644 --- a/pkgs/applications/blockchains/masari/default.nix +++ b/pkgs/applications/blockchains/masari/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { postPatch = '' # remove vendored libraries rm -r external/{miniupnpc,rapidjson} + + # include missing headers + sed -i "1i #include " src/device/device_default.hpp + sed -i "1i #include " contrib/epee/include/storages/portable_storage.h ''; nativeBuildInputs = [ cmake pkg-config git ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cb13d356732..fe044ab1f19a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36016,7 +36016,7 @@ with pkgs; oxen = callPackage ../applications/blockchains/oxen { stdenv = gcc10StdenvCompat; boost = boost17x; }; - masari = callPackage ../applications/blockchains/masari { boost = boost174; }; + masari = callPackage ../applications/blockchains/masari { }; napari = with python3Packages; toPythonApplication napari;