From 1fe515db8c1996b04a7ff51d665c0be6f39b6168 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 2 Apr 2015 17:43:47 -0700 Subject: [PATCH] samba4: Fix documentation generation --- pkgs/servers/samba/4.x.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 162d6b1d30bf..a69fc23117f5 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns -, docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser -, pythonPackages, libbsd, nss_wrapper, socket_wrapper, uid_wrapper, libarchive +{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl +, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent +, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper +, uid_wrapper, libarchive # source3/wscript optionals , kerberos ? null @@ -49,9 +50,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42 - readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit - libbsd nss_wrapper socket_wrapper uid_wrapper libarchive + python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 + docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser + pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper + libarchive kerberos openldap cups pam avahi acl libaio fam ceph glusterfs @@ -65,6 +67,9 @@ stdenv.mkDerivation rec { postPatch = '' # Removes absolute paths in scripts sed -i 's,/sbin/,,g' ctdb/config/functions + + # Fix the XML Catalog Paths + sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py ''; enableParallelBuilding = true;