From 14e505c6fa731d950d3896c344fa4586838bf9e9 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 26 Apr 2019 19:03:28 +0900 Subject: [PATCH] socat: fix darwin build --- pkgs/tools/networking/socat/default.nix | 2 ++ pkgs/tools/networking/socat/speed-type-fix.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/networking/socat/speed-type-fix.patch diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 834ea1bd873d..ec62c105c62c 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./speed-type-fix.patch; + postPatch = '' patchShebangs test.sh substituteInPlace test.sh \ diff --git a/pkgs/tools/networking/socat/speed-type-fix.patch b/pkgs/tools/networking/socat/speed-type-fix.patch new file mode 100644 index 000000000000..58e4c716bba0 --- /dev/null +++ b/pkgs/tools/networking/socat/speed-type-fix.patch @@ -0,0 +1,13 @@ +diff --git a/xio-termios.h b/xio-termios.h +index a288a2f..9858aab 100644 +--- a/xio-termios.h ++++ b/xio-termios.h +@@ -148,7 +148,7 @@ extern int xiotermiosflag_applyopt(int fd, struct opt *opt); + extern int xiotermios_value(int fd, int word, tcflag_t mask, tcflag_t value); + extern int xiotermios_char(int fd, int n, unsigned char c); + #ifdef HAVE_TERMIOS_ISPEED +-extern int xiotermios_speed(int fd, int n, unsigned int speed); ++extern int xiotermios_speed(int fd, int n, speed_t speed); + #endif + extern int xiotermios_spec(int fd, int optcode); + extern int xiotermios_flush(int fd);