Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ptlib: bump version and fix build for ZHF

+18 -34
+18 -34
pkgs/development/libraries/ptlib/default.nix
··· 1 - x@{builderDefsPackage 2 - , autoconf, automake, libtool, doxygen, pkgconfig, bison, flex, unixODBC 3 - , openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib 4 - , ...}: 5 - builderDefsPackage 6 - (a : 7 - let 8 - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 9 - []; 1 + { stdenv, fetchurl, pkgconfig, bison, flex, unixODBC 2 + , openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib }: 10 3 11 - buildInputs = map (n: builtins.getAttr n x) 12 - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); 13 - sourceInfo = rec { 14 - baseName="ptlib"; 15 - baseVersion="2.6"; 16 - patchlevel="7"; 17 - version="${baseVersion}.${patchlevel}"; 18 - name="${baseName}-${version}"; 19 - url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2"; 20 - hash="0zxrygl2ivbciqf97yd9n67ch9vd9gp236w96i6ia8fxzqjq5lkx"; 21 - }; 22 - in 23 - rec { 24 - src = a.fetchurl { 25 - url = sourceInfo.url; 26 - sha256 = sourceInfo.hash; 4 + stdenv.mkDerivation rec { 5 + name = "ptlib-2.10.10"; 6 + 7 + src = fetchurl { 8 + url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz"; 9 + sha256 = "7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4"; 27 10 }; 28 11 29 - inherit (sourceInfo) name version; 30 - inherit buildInputs; 12 + buildInputs = [ pkgconfig bison flex unixODBC openssl openldap 13 + cyrus_sasl krb5 expat SDL libdv libv4l alsaLib ]; 31 14 32 - /* doConfigure should be removed if not needed */ 33 - phaseNames = ["doConfigure" "doMakeInstall"]; 15 + enableParallelBuilding = true; 16 + 17 + patches = [ ./bison.patch ]; 34 18 35 - meta = { 19 + meta = with stdenv.lib; { 36 20 description = "Portable Tools from OPAL VoIP"; 37 - maintainers = [ a.lib.maintainers.raskin ]; 38 - platforms = a.lib.platforms.linux; 39 - broken = true; 21 + maintainers = [ maintainers.raskin ]; 22 + platforms = platforms.linux; 40 23 }; 24 + 41 25 passthru = { 42 26 updateInfo = { 43 27 downloadPage = "http://ftp.gnome.org/sources/ptlib/"; 44 28 }; 45 29 }; 46 - }) x 30 + } 47 31