diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/tools/networking/socat/default.nix | |
parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/tools/networking/socat/default.nix')
-rw-r--r-- | pkgs/tools/networking/socat/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 0e9efb028ba8..37fe3398ae8b 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, readline }: +{ stdenv, fetchurl, openssl, readline, which, nettools }: stdenv.mkDerivation rec { name = "socat-1.7.3.2"; @@ -8,10 +8,20 @@ stdenv.mkDerivation rec { sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"; }; + postPatch = '' + patchShebangs test.sh + substituteInPlace test.sh \ + --replace /bin/rm rm \ + --replace /sbin/ifconfig ifconfig + ''; + buildInputs = [ openssl readline ]; hardeningEnable = [ "pie" ]; + checkInputs = [ which nettools ]; + doCheck = false; # fails a bunch, hangs + meta = { description = "A utility for bidirectional data transfer between two independent data channels"; homepage = http://www.dest-unreach.org/socat/; |