diff options
| author | Janne Heß <janne@hess.ooo> | 2021-12-12 20:14:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 20:14:58 +0100 |
| commit | a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf (patch) | |
| tree | c6532f893755bceaf58bb655c6ddbb1d605d4c37 | |
| parent | 278dd8be91a88d140cb191db5c84e61e9ac8dacb (diff) | |
| parent | f720cf68d09b57ebe23904ba7933871be7935bb6 (diff) | |
| download | nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.tar nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.tar.gz nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.tar.bz2 nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.tar.lz nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.tar.xz nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.tar.zst nixpkgs-a7c898f5f43bc5ae65f61b49a5ae3a0316fdbcaf.zip | |
Merge pull request #150108 from midchildan/fix/socat-darwin
| -rw-r--r-- | pkgs/tools/networking/socat/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch | 21 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 8dac32cef5a..b26760a7294 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M="; }; + patches = [ + # This adds missing feature checks for TCP_INFO, a Linux feature + # + # Discussed in https://github.com/Homebrew/homebrew-core/pull/88595 + ./socat-fix-feature-check-tcpinfo.patch + ]; + postPatch = '' patchShebangs test.sh substituteInPlace test.sh \ diff --git a/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch b/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch new file mode 100644 index 00000000000..ec0ea88359c --- /dev/null +++ b/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch @@ -0,0 +1,21 @@ +diff --git a/filan.c b/filan.c +index 3465f7c..77c22a4 100644 +--- a/filan.c ++++ b/filan.c +@@ -905,6 +905,7 @@ int tcpan(int fd, FILE *outfile) { + #if WITH_TCP + + int tcpan2(int fd, FILE *outfile) { ++#ifdef TCP_INFO + struct tcp_info tcpinfo; + socklen_t tcpinfolen = sizeof(tcpinfo); + int result; +@@ -930,6 +931,8 @@ int tcpan2(int fd, FILE *outfile) { + // fprintf(outfile, "%s={%u}\t", "TCPI_", tcpinfo.tcpi_); + + return 0; ++#endif ++ return -1; + } + + #endif /* WITH_TCP */ |