Merge pull request #236500 from wegank/masari-boost

masari: unpin boost174
2023-06-08 00:33:06 +03:00
parent 12c75a0740 a38a164196
commit c59eb37090
2 changed files with 5 additions and 1 deletions
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
  postPatch = ''
    # remove vendored libraries
    rm -r external/{miniupnpc,rapidjson}
+
+    # include missing headers
+    sed -i "1i #include <map>" src/device/device_default.hpp
+    sed -i "1i #include <boost/mpl/contains.hpp>" contrib/epee/include/storages/portable_storage.h
  '';

  nativeBuildInputs = [ cmake pkg-config git ];
@@ -36023,7 +36023,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;