diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-02-10 12:23:19 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-02-10 12:23:19 +0900 |
| commit | 0780537546b6694baaa071b2333fc1af43aa420c (patch) | |
| tree | 6c70e3ee4f848bcf0204d0bd8d36cd14f2a9d6fd /pkgs/tools | |
| parent | c65ddd0d5eb361d662d84c064c1c39308734c960 (diff) | |
| download | nixlib-0780537546b6694baaa071b2333fc1af43aa420c.tar nixlib-0780537546b6694baaa071b2333fc1af43aa420c.tar.gz nixlib-0780537546b6694baaa071b2333fc1af43aa420c.tar.bz2 nixlib-0780537546b6694baaa071b2333fc1af43aa420c.tar.lz nixlib-0780537546b6694baaa071b2333fc1af43aa420c.tar.xz nixlib-0780537546b6694baaa071b2333fc1af43aa420c.tar.zst nixlib-0780537546b6694baaa071b2333fc1af43aa420c.zip | |
socat: remove patch that is now in upstream
Diffstat (limited to 'pkgs/tools')
| -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, 0 insertions, 15 deletions
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 500d33827b3f..ba7aaee63ab9 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -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 \ diff --git a/pkgs/tools/networking/socat/speed-type-fix.patch b/pkgs/tools/networking/socat/speed-type-fix.patch deleted file mode 100644 index 58e4c716bba0..000000000000 --- a/pkgs/tools/networking/socat/speed-type-fix.patch +++ /dev/null @@ -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); |