diff options
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 39 |
2 files changed, 11 insertions, 41 deletions
diff --git a/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch b/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch deleted file mode 100644 index 7ce1b4f527e..00000000000 --- a/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ninfod/meson.build b/ninfod/meson.build -index ea7ec1b..fada05b 100644 ---- a/ninfod/meson.build -+++ b/ninfod/meson.build -@@ -10,7 +10,7 @@ ninfod_sources = files(''' - ninfod_name.c - '''.split()) - executable('ninfod', [ninfod_sources, git_version_h], -- dependencies : [cap_dep, crypto_dep, rt_dep, threads], -+ dependencies : [cap_dep, dependency('openssl'), rt_dep, threads], - link_with : [libcommon], - include_directories : inc, - install: true, diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 0d27d5d97fc..3944a7b37fb 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,42 +1,27 @@ { stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns -, libcap, nettle, libidn2, openssl, systemd +, libcap, nettle, libidn2, systemd }: with stdenv.lib; let - time = "20190515"; - # ninfod probably could build on cross, but the Makefile doesn't pass --host - # etc to the sub configure... - withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; + version = "20190709"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; - url = "https://github.com/iputils/iputils/blob/s${time}/rdisc.c"; + url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; }; -in stdenv.mkDerivation { - name = "iputils-${time}"; +in stdenv.mkDerivation rec { + pname = "iputils"; + inherit version; src = fetchFromGitHub { - owner = "iputils"; - repo = "iputils"; - rev = "s${time}"; - sha256 = "1k2wzgk0d47d1g9k8c1a5l24ml8h8xxz1vrs0vfbyxr7qghdhn4i"; + owner = pname; + repo = pname; + rev = "s${version}"; + sha256 = "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693"; }; - # ninfod cannot be build with nettle yet: - patches = - [ ./build-ninfod-with-openssl.patch - (fetchpatch { # build-sys/doc: Fix the dependency on xsltproc - url = "https://github.com/iputils/iputils/commit/3b013f271931c3fe771e5a2c591f35d617de90f3.patch"; - sha256 = "0ilhlgiqdflry7km3ik8i4h1yymm5f5zmwyl5r029q7x1p8kinfw"; - }) - (fetchpatch { # build-sys: Make setcap really optional - url = "https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551.patch"; - sha256 = "0781147qaf0jwa177jbmh474r8hqs0jwgi5vgx9csb43jzdm8hqf"; - }) - ]; - mesonFlags = [ "-DUSE_CRYPTO=nettle" "-DBUILD_RARPD=true" @@ -44,14 +29,12 @@ in stdenv.mkDerivation { "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" ] - ++ optional (!withNinfod) "-DBUILD_NINFOD=false" # 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 nettle systemd ] - ++ optional (!stdenv.hostPlatform.isMusl) libidn2 - ++ optional withNinfod openssl; # TODO: Build with nettle + ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { homepage = https://github.com/iputils/iputils; |