alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

iputils: 20210202 -> 20210722

Browse source
This commit is contained in:
Michael Weiss 2021-07-23 11:03:00 +02:00 committed by Frederik Rietdijk
parent 1b3ba289b2
commit aa760facf3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/os-specific/linux/iputils/default.nix
View file

@ -1,11 +1,12 @@
{ lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
, libcap, libidn2
, iproute2
, apparmorRulesFromClosure
}:
let
version = "20210202";
version = "20210722";
sunAsIsLicense = {
fullName = "AS-IS, SUN MICROSYSTEMS license";
url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c";
@ -18,11 +19,20 @@ in stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = version;
sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3";
sha256 = "139fyifsjm0i012rhcx3ra3pxx2wxh77dfd551d8lgiv2mqd742j";
};
postPatch = lib.optionalString (!doCheck) ''
# There isn't a Meson option for this yet:
sed -i '/##### TESTS #####/q' ping/meson.build
'';
outputs = ["out" "apparmor"];
# We don't have the required permissions inside the build sandbox:
# /build/source/build/ping/ping: socket: Operation not permitted
doCheck = false;
mesonFlags = [
"-DBUILD_RARPD=true"
"-DBUILD_TRACEROUTE6=true"
@ -37,6 +47,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
buildInputs = [ libcap ]
++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2;
checkInputs = [ iproute2 ];
postInstall = ''
mkdir $apparmor
cat >$apparmor/bin.ping <<EOF