summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-03-03 13:36:03 +0100
committerGitHub <noreply@github.com>2021-03-03 13:36:03 +0100
commit590c7ceb42280b0592032dcb0fe236a8d99e68b7 (patch)
tree9a3b8ebb51eb543cb6abf3067466568e59451e3e
parent369dac84389501143ee1fef1bc5d2026e6e5065b (diff)
parent4d6fe8fb1701c24a613dcd8eb8da857fc10c215d (diff)
downloadnixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.tar
nixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.tar.gz
nixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.tar.bz2
nixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.tar.lz
nixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.tar.xz
nixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.tar.zst
nixpkgs-590c7ceb42280b0592032dcb0fe236a8d99e68b7.zip
Merge pull request #114840 from marsam/update-caf
caf: 0.17.6 -> 0.18.0
-rw-r--r--pkgs/development/libraries/caf/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index fdc06df948d..944b5276c5a 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "actor-framework";
-  version = "0.17.6";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
     rev = version;
-    sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz";
+    sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ];
 
   cmakeFlags = [
-    "-DCAF_NO_EXAMPLES:BOOL=TRUE"
+    "-DCAF_ENABLE_EXAMPLES:BOOL=OFF"
   ];
 
   doCheck = true;
   checkTarget = "test";
   preCheck = ''
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib
-    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
+    export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
+    export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
   '';
 
   meta = with lib; {