diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
| commit | d2e147bedf251976ed99b94b6c905d6761f7a892 (patch) | |
| tree | 9e0c62d61698916fd4627ed98d3d880c8fc0ab2e /pkgs/os-specific/linux/iputils/default.nix | |
| parent | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (diff) | |
| parent | c464dc811babfe316ed4ab7bbc12351122e69dd7 (diff) | |
| download | nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.gz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.bz2 nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.lz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.xz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.zst nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master
Diffstat (limited to 'pkgs/os-specific/linux/iputils/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 495860ef576..c949069885d 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -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 |