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

Merge pull request #79683 from thefloweringash/socat-fix-darwin

Browse Source 
socat: remove patch that is now in upstream
This commit is contained in:
Michael Raskin 2020-02-10 06:37:11 +00:00 committed by GitHub
commit 7c72f165c3
2 changed files with 0 additions and 15 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,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp";
};
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
View File

@ -1,13 +0,0 @@
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);