From 571e1a8251ee7d617445d910a93326076a770d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Aug 2024 08:43:09 +0200 Subject: [PATCH] iproute2: fix static build again --- pkgs/os-specific/linux/iproute/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index d14b6210f257..56a5e24e1b81 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , buildPackages, bison, flex, pkg-config , db, iptables, elfutils, libmnl ,libbpf -, gitUpdater +, gitUpdater, pkgsStatic }: stdenv.mkDerivation rec { @@ -47,9 +47,11 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC nativeBuildInputs = [ bison flex pkg-config ]; - buildInputs = [ db iptables libmnl libbpf ] + buildInputs = [ db iptables libmnl ] # needed to uploaded bpf programs - ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ elfutils ]; + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + elfutils libbpf + ]; enableParallelBuilding = true; @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git"; rev-prefix = "v"; }; + # needed for nixos-anywhere + passthru.tests.static = pkgsStatic.iproute2; meta = with lib; { homepage = "https://wiki.linuxfoundation.org/networking/iproute2";