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

inetutils: cleanup

Browse Source 
- supports darwin (only when servers are disabled)
- pass SUIDMODE= to avoid setuid
- add myself as maintainer
This commit is contained in:
Matthew Bauer 2018-04-30 22:28:42 -05:00
parent 8838533ec1
commit 85e1f22b98
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/networking/inetutils/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, perl, help2man }: { stdenv, lib, fetchurl, ncurses, perl, help2man }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "inetutils-1.9.4"; name = "inetutils-1.9.4";
@ -16,25 +16,20 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ];
configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ]
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd
"--disable-rcp" "--disable-rcp"
"--disable-rsh" "--disable-rsh"
"--disable-rlogin" "--disable-rlogin"
"--disable-rexec" "--disable-rexec"
]; ] ++ lib.optional stdenv.isDarwin "--disable-servers";
# Test fails with "UNIX socket name too long", probably because our # Test fails with "UNIX socket name too long", probably because our
# $TMPDIR is too long. # $TMPDIR is too long.
#doCheck = true; doCheck = false;
installFlags = [ "SUIDMODE=" ];
postInstall = '' meta = with lib; {
# XXX: These programs are normally installed setuid but since it
# fails, they end up being non-executable, hence this hack.
chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute}
'';
meta = {
description = "Collection of common network programs"; description = "Collection of common network programs";
longDescription = longDescription =
@ -45,9 +40,9 @@ stdenv.mkDerivation rec {
''; '';
homepage = http://www.gnu.org/software/inetutils/; homepage = http://www.gnu.org/software/inetutils/;
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ ]; maintainers = with maintainers; [ matthewbauer ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; platforms = platforms.unix;
}; };
} }