caf: fix on clang4

Also, enable parallel builds because I got sick of waiting :)
NixOS · Mar 30, 2017 · 8636ce2 · 8636ce2
1 parent 409fe12
commit 8636ce2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   name = "actor-framework-${version}";
@@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2";
   };
 
+  # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this
+  patches = [ (fetchpatch {
+    url    = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch";
+    sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj";
+  }) ];
+
   nativeBuildInputs = [ cmake ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "An open source implementation of the actor model in C++";
     homepage = http://actor-framework.org/;