iputils: 20210202 -> 20210722
This commit is contained in:
parent
1b3ba289b2
commit
aa760facf3
|
@ -1,11 +1,12 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib, stdenv, fetchFromGitHub
|
||||||
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
|
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
|
||||||
, libcap, libidn2
|
, libcap, libidn2
|
||||||
|
, iproute2
|
||||||
, apparmorRulesFromClosure
|
, apparmorRulesFromClosure
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "20210202";
|
version = "20210722";
|
||||||
sunAsIsLicense = {
|
sunAsIsLicense = {
|
||||||
fullName = "AS-IS, SUN MICROSYSTEMS license";
|
fullName = "AS-IS, SUN MICROSYSTEMS license";
|
||||||
url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c";
|
url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c";
|
||||||
|
@ -18,11 +19,20 @@ in stdenv.mkDerivation rec {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
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"];
|
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 = [
|
mesonFlags = [
|
||||||
"-DBUILD_RARPD=true"
|
"-DBUILD_RARPD=true"
|
||||||
"-DBUILD_TRACEROUTE6=true"
|
"-DBUILD_TRACEROUTE6=true"
|
||||||
|
@ -37,6 +47,8 @@ in stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
|
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
|
||||||
buildInputs = [ libcap ]
|
buildInputs = [ libcap ]
|
||||||
++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2;
|
++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2;
|
||||||
|
checkInputs = [ iproute2 ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir $apparmor
|
mkdir $apparmor
|
||||||
cat >$apparmor/bin.ping <<EOF
|
cat >$apparmor/bin.ping <<EOF
|
||||||
|
|
Loading…
Reference in a new issue