diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix index e12c44888a0b..3bb653ebcf78 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns -, libcap, systemd, libidn2 +, libcap, libidn2 }: with stdenv.lib; @@ -22,18 +22,27 @@ in stdenv.mkDerivation rec { sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; }; + patches = [ + # Proposed upstream patch to reduce dependency on systemd: https://github.com/iputils/iputils/pull/297 + (fetchpatch { + url = "https://github.com/iputils/iputils/commit/13d6aefd57fd471ecad06e19073dcc44608dff5e.patch"; + sha256 = "1n62zxmzp7hgz9qapbbpqv3fxqvc3qyd2a73jhp357x6by84kj49"; + }) + ]; + mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" "-DBUILD_TFTPD=true" "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" + "-DINSTALL_SYSTEMD_UNITS=true" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; - buildInputs = [ libcap systemd ] + buildInputs = [ libcap ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { |