diff options
| author | xeji <xeji@cat3.de> | 2018-03-25 17:56:06 +0200 |
|---|---|---|
| committer | xeji <xeji@cat3.de> | 2018-03-25 17:56:06 +0200 |
| commit | 4308403c303f45d47bd85643261e27cc74dd47cb (patch) | |
| tree | 00a936bc0e065d38c952377dc14940a3dcb33191 | |
| parent | 8c2c82bf1443395d916561617d4148ea00827a52 (diff) | |
| download | nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.tar nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.tar.gz nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.tar.bz2 nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.tar.lz nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.tar.xz nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.tar.zst nixlib-4308403c303f45d47bd85643261e27cc74dd47cb.zip | |
ptlib: fix build
patch typedef clashes with unixODBC>=2.3.5
| -rw-r--r-- | pkgs/development/libraries/ptlib/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index f980a14aa41d..ae60a6f69d63 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -24,12 +24,16 @@ stdenv.mkDerivation rec { (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; }) - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support; - sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4"; - }) ./ptlib-2.10.11-glibc-2.26.patch ]; + # fix typedef clashes with unixODBC>=2.3.5 + postPatch = '' + substituteInPlace include/ptlib/unix/ptlib/contain.h \ + --replace "typedef uintptr_t UINT" "typedef unsigned int UINT" \ + --replace "typedef wchar_t WCHAR" "typedef unsigned short WCHAR" + ''; + meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; |