about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libcmis/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libcmis/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/libcmis/default.nix29
1 files changed, 17 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
index f1e57272d0b8..53474190ce96 100644
--- a/nixpkgs/pkgs/development/libraries/libcmis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl, autoreconfHook }:
+{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }:
 
 stdenv.mkDerivation rec {
-  name = "libcmis-${version}";
-  version = "0.5.0";
+  pname = "libcmis";
+  version = "0.5.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/libcmis/${name}.tar.gz";
-    sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
+  src = fetchFromGitHub {
+    owner = "tdf";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57";
   };
 
-  patches = [ ./gcc5.patch ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ];
+  buildInputs = [ boost libxml2 curl cppunit ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ boost libxml2 curl ];
-  configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ];
+  configureFlags = [
+    "--disable-werror"
+    "DOCBOOK2MAN=${docbook2x}/bin/docbook2man"
+  ];
 
-  # Cppcheck cannot find all the include files (use --check-config for details)
-  doCheck = false;
+  doCheck = true;
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "C++ client library for the CMIS interface";