From 3768bdf227e4c4962253880ae2be3cfc0752af58 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Sat, 25 Jul 2015 15:36:28 +0200 Subject: [PATCH] libcouchbase: 2.4.4 -> 2.5.2, refactor to use cmake Building libcouchbase with automake is deprecated, thus use cmake instead. This has the advantage that the package-config file is installed as well. --- .../libraries/libcouchbase/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index bcc9e9f673f..2784cd90a5c 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, -pkgconfig, perl, git, libevent, openssl}: +{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}: stdenv.mkDerivation { - name = "libcouchbase-2.4.4"; - src = fetchgit { - url = "https://github.com/couchbase/libcouchbase.git"; - rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac"; - sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9"; - leaveDotGit = true; + name = "libcouchbase-2.5.2"; + src = fetchurl { + url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz"; + sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24"; }; - preConfigure = '' - patchShebangs ./config/ - ./config/autorun.sh - ''; + cmakeFlags = "-DLCB_NO_MOCK=ON"; - configureFlags = "--disable-couchbasemock"; - - buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libevent openssl]; meta = { description = "C client library for Couchbase";