colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

socat: fix darwin build

Browse Source
This commit is contained in:
Andrew Childs 2019-04-26 19:03:28 +09:00
parent d16a5a5916
commit 14e505c6fa
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/networking/socat/default.nix
View File

@ -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 \

13
pkgs/tools/networking/socat/speed-type-fix.patch Normal file
View File

@ -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);