about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-11-15 21:42:26 +0000
committerOrivej Desh <orivej@gmx.fr>2017-11-15 21:42:26 +0000
commitf96b3bf8717f11191cecdafd3fe8ff96ca02df52 (patch)
tree64e2dd693084c2913ad3ede2816b66306399a155 /pkgs/development/libraries
parentf55308e7498b53dc0726fd35488a60ecd1a98648 (diff)
downloadnixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.tar
nixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.tar.gz
nixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.tar.bz2
nixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.tar.lz
nixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.tar.xz
nixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.tar.zst
nixlib-f96b3bf8717f11191cecdafd3fe8ff96ca02df52.zip
ptlib: fix build with glibc 2.26
Tracking issue: #31696
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/ptlib/default.nix2
-rw-r--r--pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch13
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index c5d3d7411309..f980a14aa41d 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     (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
   ];
 
   meta = with stdenv.lib; {
@@ -41,4 +42,3 @@ stdenv.mkDerivation rec {
     };
   };
 }
-
diff --git a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch b/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch
new file mode 100644
index 000000000000..300c3736abf7
--- /dev/null
+++ b/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ptlib/unix/channel.cxx b/src/ptlib/unix/channel.cxx
+index 3b17dda..2dcaa18 100644
+--- a/src/ptlib/unix/channel.cxx
++++ b/src/ptlib/unix/channel.cxx
+@@ -36,7 +36,7 @@
+ 
+ #include <ptlib.h>
+ #include <sys/ioctl.h>
+-
++#include <sys/uio.h>
+ 
+ #include "../common/pchannel.cxx"
+