Merge branch 'staging-next' into staging

2019-09-10 07:06:45 +02:00
parent dc051dfdef 8752ff2254
commit 1716d62f63
82 changed files with 1206 additions and 617 deletions
@@ -94,7 +94,12 @@ self: super: builtins.intersectAttrs super {
  # Won't find it's header files without help.
  sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";

-  cachix = enableSeparateBinOutput super.cachix;
+  cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace cachix.cabal --replace "c++14" "c++17"
+    '';
+  });
+
  ghcid = enableSeparateBinOutput super.ghcid;

  hzk = overrideCabal super.hzk (drv: {