about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-06-16 06:56:35 +0000
committerAlyssa Ross <hi@alyssa.is>2023-06-16 06:56:35 +0000
commit99fcaeccb89621dd492203ce1f2d551c06f228ed (patch)
tree41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/cassandra-cpp-driver
parent59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff)
parent75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff)
downloadnixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar
nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz
nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2
nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz
nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz
nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst
nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cassandra-cpp-driver')
-rw-r--r--nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix
index fb31f1e50abb..f9f823bf0ae1 100644
--- a/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix
+++ b/nixpkgs/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";