Merge master into staging-next

2021-05-19 00:55:36 +00:00
parent abbbeaf42a 4e211c1b09
commit 7000ae2b9a
49 changed files with 626 additions and 171 deletions
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {

  buildInputs = [ boost165 ];

+  makeFlags = [
+    "CXX=${stdenv.cc.targetPrefix}c++"
+    "BOOST_DIR=${boost165.dev}/include"
+  ];
+
  installPhase = ''
    mkdir -p $out/bin
    mv starspace $out/bin