talloc: 2.0.1 -> 2.1.1

This commit is contained in:
William A. Kennington III 2014-04-29 14:26:09 -05:00
parent da2c17cc58
commit 70b7ec0ad2
2 changed files with 28 additions and 13 deletions

View file

@ -1,24 +1,37 @@
{ fetchurl, stdenv }: { stdenv, fetchurl, python27, pkgconfig, readline, gettext, libxslt, docbook_xsl
, docbook_xml_dtd_42
, acl ? null, heimdal ? null, libaio ? null, pam ? null, zlib ? null
, libgcrypt ? null, libcap ? null
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "talloc-2.0.1"; name = "talloc-2.1.1";
src = fetchurl { src = fetchurl {
url = "http://samba.org/ftp/talloc/${name}.tar.gz"; url = "http://samba.org/ftp/talloc/${name}.tar.gz";
sha256 = "1d694zyi451a5zr03l5yv0n8yccyr3r8pmzga17xaaaz80khb0av"; sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y";
}; };
configureFlags = "--enable-talloc-compat1 --enable-largefile"; buildInputs = [
python27 pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42
# https://bugzilla.samba.org/show_bug.cgi?id=7000 acl heimdal libaio pam zlib libgcrypt libcap
postConfigure = if stdenv.isDarwin then '' ];
substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -Wl,-install_name,"
'' else "";
meta = { preConfigure = ''
sed -i 's,#!/usr/bin/env python,#!${python27}/bin/python,g' buildtools/bin/waf
'';
configureFlags = [
"--enable-talloc-compat1"
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
];
meta = with stdenv.lib; {
description = "Hierarchical pool based memory allocator with destructors"; description = "Hierarchical pool based memory allocator with destructors";
homepage = http://tdb.samba.org/; homepage = http://tdb.samba.org/;
license = stdenv.lib.licenses.gpl3; license = licenses.gpl3;
platforms = stdenv.lib.platforms.all; maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;
}; };
} }

View file

@ -6847,7 +6847,9 @@ let
taglib_extras = callPackage ../development/libraries/taglib-extras { }; taglib_extras = callPackage ../development/libraries/taglib-extras { };
talloc = callPackage ../development/libraries/talloc { }; talloc = callPackage ../development/libraries/talloc {
libgcrypt = libgcrypt_1_6;
};
tclap = callPackage ../development/libraries/tclap {}; tclap = callPackage ../development/libraries/tclap {};