Merge master into staging-next

2021-05-22 06:21:55 +00:00
parent 7507aed4e1 b9b3420feb
commit cc35c7fc85
11 changed files with 138 additions and 23 deletions
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk=";
  };

+  # https://github.com/SRI-CSL/libpoly/pull/52
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/CMakeLists.txt --replace \
+      '"utils/open_memstream.c ''${poly_SOURCES}"' \
+      'utils/open_memstream.c ''${poly_SOURCES}'
+  '';
+
  nativeBuildInputs = [ cmake ];

  buildInputs = [ gmp python3 ];