From db31fcec3ff370ddc6195e9d933deac9351a529c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 May 2023 08:21:38 +0100 Subject: [PATCH] cassandra-cpp-driver: fix libuv include path After `libuv` split out `dev` output `cassandra-cpp-driver` build failed as https://hydra.nixos.org/build/219951761: -- Could NOT find libuv, try to set the path to libuv root folder in the system variable LIBUV_ROOT_DIR (missing: LIBUV_INCLUDE_DIR) (Required is at least version "1.0.0") Fix build by passing `LIBUV_INCLUDE_DIR` explicitly. ZHF #230712 --- .../cassandra-cpp-driver/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/development/libraries/cassandra-cpp-driver/default.nix index fb31f1e50ab..f9f823bf0ae 100644 --- a/pkgs/development/libraries/cassandra-cpp-driver/default.nix +++ b/pkgs/development/libraries/cassandra-cpp-driver/default.nix @@ -1,7 +1,12 @@ -{ fetchFromGitHub, - lib, stdenv, - cmake, zlib, libuv, openssl, - examples ? false +{ fetchFromGitHub +, lib +, stdenv +, cmake +, zlib +, libuv +, openssl +, pkg-config +, examples ? false }: stdenv.mkDerivation rec { pname = "cassandra-cpp-driver"; version = "2.16.2"; @@ -13,14 +18,13 @@ sha256 = "sha256-NAvaRLhEvFjSmXcyM039wLC6IfLws2rkeRpbE5eL/rQ="; }; - LIBUV_ROOT_DIR = "${libuv}/"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libuv openssl.dev ]; - cmakeFlags = lib.attrsets.mapAttrsToList + cmakeFlags = (lib.attrsets.mapAttrsToList (name: value: "-DCASS_BUILD_${name}:BOOL=${if value then "ON" else "OFF"}") { EXAMPLES = examples; - }; + }) ++ [ "-DLIBUV_INCLUDE_DIR=${lib.getDev libuv}/include" ]; meta = with lib; { description = "DataStax CPP cassandra driver";