pyrox.dev
iputils: 20210202 -> 20210722
authored by Michael Weiss and committed by Frederik Rietdijk aa760fac 1b3ba289
+14
-2
pkgs/os-specific/linux/iputils/default.nix
+14
-2
pkgs/os-specific/linux/iputils/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub
2
2
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
3
3
, libcap, libidn2
4
+
, iproute2
4
5
, apparmorRulesFromClosure
5
6
}:
6
7
7
8
let
8
-
version = "20210202";
9
+
version = "20210722";
9
10
sunAsIsLicense = {
10
11
fullName = "AS-IS, SUN MICROSYSTEMS license";
11
12
url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c";
···
18
19
owner = pname;
19
20
repo = pname;
20
21
rev = version;
21
-
sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3";
22
+
sha256 = "139fyifsjm0i012rhcx3ra3pxx2wxh77dfd551d8lgiv2mqd742j";
22
23
};
23
24
25
+
postPatch = lib.optionalString (!doCheck) ''
26
+
# There isn't a Meson option for this yet:
27
+
sed -i '/##### TESTS #####/q' ping/meson.build
28
+
'';
29
+
24
30
outputs = ["out" "apparmor"];
31
+
32
+
# We don't have the required permissions inside the build sandbox:
33
+
# /build/source/build/ping/ping: socket: Operation not permitted
34
+
doCheck = false;
25
35
26
36
mesonFlags = [
27
37
"-DBUILD_RARPD=true"
···
37
47
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
38
48
buildInputs = [ libcap ]
39
49
++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2;
50
+
checkInputs = [ iproute2 ];
51
+
40
52
postInstall = ''
41
53
mkdir $apparmor
42
54
cat >$apparmor/bin.ping <<EOF