diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-30 11:36:30 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-30 11:36:30 -0400 |
| commit | 8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a (patch) | |
| tree | d959af8b77d0cf43be28c49c8dcce1514a7273b6 /pkgs/development | |
| parent | 409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4 (diff) | |
| download | nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.tar nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.tar.gz nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.tar.bz2 nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.tar.lz nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.tar.xz nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.tar.zst nixpkgs-8636ce283fd9ec1d16ea604b4dd5a26b8c59c69a.zip | |
caf: fix on clang4
Also, enable parallel builds because I got sick of waiting :)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/caf/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index d3e655676e6..d3b6722b36c 100644 --- 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/; |