summary refs log tree commit diff
path: root/pkgs/os-specific/linux/iproute
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-04-06 13:51:21 +0200
committerMichael Weiss <dev.primeos@gmail.com>2020-04-06 14:00:06 +0200
commit94f2a76718d30acee9fe16ae8c7b24f349c3cd75 (patch)
treed1e8721abf5e4f14454011ac9fb103dcb31bb2d4 /pkgs/os-specific/linux/iproute
parentaa46e1ae342feed39eaf1e63ffadfc69606dafb0 (diff)
downloadnixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.tar
nixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.tar.gz
nixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.tar.bz2
nixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.tar.lz
nixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.tar.xz
nixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.tar.zst
nixpkgs-94f2a76718d30acee9fe16ae8c7b24f349c3cd75.zip
iproute: Build the netem tools
They will be installed now and we can provide $HOSTCC for
cross-compilation.

New files:
+lib/tc/experimental.dist
+lib/tc/normal.dist
+lib/tc/pareto.dist
+lib/tc/paretonormal.dist

Note: The distributions are generated in a reproducible way.

Co-Authored-By: Benjamin Saunders <ben.e.saunders@gmail.com>
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
-rw-r--r--pkgs/os-specific/linux/iproute/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index fd7417839a1..9f6df0fccd5 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, bison, flex, pkg-config
+, buildPackages, bison, flex, pkg-config
 , db, iptables, libelf, libmnl
 }:
 
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     # Don't try to create /var/lib/arpd:
     sed -e '/ARPDDIR/d' -i Makefile
-    # Don't build netem tools--they're not installed and require HOSTCC
-    substituteInPlace Makefile --replace " netem " " "
   '';
 
   outputs = [ "out" "dev" ];
@@ -36,6 +34,7 @@ stdenv.mkDerivation rec {
     "CONFDIR=$(out)/etc/iproute2"
   ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
   nativeBuildInputs = [ bison flex pkg-config ];
   buildInputs = [ db iptables libelf libmnl ];