diff --git a/pkgs/by-name/li/libcmis/package.nix b/pkgs/by-name/li/libcmis/package.nix index cf1408c4e1a5..7a93bb03fc7c 100644 --- a/pkgs/by-name/li/libcmis/package.nix +++ b/pkgs/by-name/li/libcmis/package.nix @@ -2,39 +2,37 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, boost, libxml2, pkg-config, - docbook2x, + docbook_xml_dtd_43, curl, autoreconfHook, cppunit, + xmlto, }: stdenv.mkDerivation (finalAttrs: { pname = "libcmis"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "tdf"; repo = "libcmis"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-chLY9tbhVPIiP+twsNM2SM7Bqyau/evQGKHfjlac6ys="; }; - patches = [ - # Backport to fix build with boost 1.86 - (fetchpatch { - url = "https://github.com/tdf/libcmis/commit/3659d32999ff7593662dcf5136bcb7ac15c13f61.patch"; - hash = "sha256-EXmQcXCHaVnF/dwU3Z4WLtaiHjYHeeonlKdyK27UkiY="; - }) - ]; + postPatch = '' + substituteInPlace doc/cmis-client.xml.in \ + --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" + ''; nativeBuildInputs = [ autoreconfHook pkg-config - docbook2x + xmlto ]; buildInputs = [ boost @@ -45,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-werror" - "DOCBOOK2MAN=${docbook2x}/bin/docbook2man" "--with-boost=${boost.dev}" ]; @@ -54,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { + changelog = "https://github.com/tdf/libcmis/blob/${finalAttrs.src.tag}/NEWS"; description = "C++ client library for the CMIS interface"; homepage = "https://github.com/tdf/libcmis"; license = lib.licenses.gpl2;