summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-12-25 11:59:45 -0500
committerGitHub <noreply@github.com>2019-12-25 11:59:45 -0500
commit51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd (patch)
treead21b08cbc08953f1d1cc7ebef6574d1c24bfe9a /pkgs
parentc571098bf8b8e81b7c167f67b927e0fcb63f4df4 (diff)
parentf5d99970d09ed60831a997719404b8a26cd5f070 (diff)
downloadnixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.tar
nixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.tar.gz
nixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.tar.bz2
nixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.tar.lz
nixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.tar.xz
nixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.tar.zst
nixpkgs-51a5e6257f6ed21f26e9e1c7293fc5b66a2a68cd.zip
Merge pull request #67771 from tobim/pkgs/caf
caf: 0.17.1 -> 0.17.2; enable openssl; run tests
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/caf/default.nix20
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 4a4cba31735..ebe89985977 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,23 +1,35 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "actor-framework";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
     rev = version;
-    sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw";
+    sha256 = "0z9qh580pa1mx9h48npwji24bjyqxm1w93wdcc4inmjzdmrqwzim";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  buildInputs = [ openssl ];
+
+  cmakeFlags = [
+    "-DCAF_NO_EXAMPLES:BOOL=TRUE"
+  ];
+
+  doCheck = true;
+  checkTarget = "test";
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+  '';
+
   meta = with stdenv.lib; {
     description = "An open source implementation of the actor model in C++";
     homepage = http://actor-framework.org/;
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ bobakker ];
+    maintainers = with maintainers; [ bobakker tobim ];
   };
 }