Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 387d7916637a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e124e203e5dd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 25, 2018

  1. ptlib: fix build 

    patch typedef clashes with unixODBC>=2.3.5
    @xeji
    xeji committed Mar 25, 2018
    Copy the full SHA
    4308403 View commit details

  2. Merge pull request #37772 from xeji/p/ptlib 

    ptlib: fix build
    @7c6f434c
    7c6f434c authored Mar 25, 2018
    Copy the full SHA
    e124e20 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/development/libraries/ptlib/default.nix
10 changes: 7 additions & 3 deletions pkgs/development/libraries/ptlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];