diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2019-04-26 19:03:28 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2019-04-26 23:56:33 +0900 |
| commit | 14e505c6fa731d950d3896c344fa4586838bf9e9 (patch) | |
| tree | 6d7e0d9177ecd08a3c64ad903131e6076ed974c9 /pkgs/tools/networking/socat | |
| parent | d16a5a5916852d54ba60ca1c408d52786f38aa67 (diff) | |
socat: fix darwin build
Diffstat (limited to 'pkgs/tools/networking/socat')
| -rw-r--r-- | pkgs/tools/networking/socat/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/socat/speed-type-fix.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 834ea1bd873..ec62c105c62 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 00000000000..58e4c716bba --- /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); |