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:50:15 +0200
committerMichael Weiss <dev.primeos@gmail.com>2020-04-06 13:56:48 +0200
commitaa46e1ae342feed39eaf1e63ffadfc69606dafb0 (patch)
tree3b728401d153b642ca12a228ed3837b00fbc209b /pkgs/os-specific/linux/iproute
parent91a20dac08ff1c2483befe90ccbd59c5b16aabde (diff)
downloadnixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.tar
nixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.tar.gz
nixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.tar.bz2
nixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.tar.lz
nixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.tar.xz
nixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.tar.zst
nixpkgs-aa46e1ae342feed39eaf1e63ffadfc69606dafb0.zip
iproute: Simplify and improve the expression
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
-rw-r--r--pkgs/os-specific/linux/iproute/default.nix20
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 624644596d9..fd7417839a1 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,7 @@
-{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }:
+{ stdenv, fetchurl
+, bison, flex, pkg-config
+, db, iptables, libelf, libmnl
+}:
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
@@ -10,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    patchShebangs ./configure
+    # 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 " " "
@@ -19,11 +22,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   makeFlags = [
-    "DESTDIR="
-    "LIBDIR=$(out)/lib"
+    "PREFIX=$(out)"
     "SBINDIR=$(out)/sbin"
-    "MANDIR=$(out)/share/man"
-    "BASH_COMPDIR=$(out)/share/bash-completion/completions"
     "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs
     "HDRDIR=$(dev)/include/iproute2"
   ];
@@ -36,17 +36,13 @@ stdenv.mkDerivation rec {
     "CONFDIR=$(out)/etc/iproute2"
   ];
 
+  nativeBuildInputs = [ bison flex pkg-config ];
   buildInputs = [ db iptables libelf libmnl ];
-  nativeBuildInputs = [ bison flex pkgconfig ];
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    PATH=${bash}/bin:$PATH patchShebangs $out/sbin
-  '';
-
   meta = with stdenv.lib; {
-    homepage = https://wiki.linuxfoundation.org/networking/iproute2;
+    homepage = "https://wiki.linuxfoundation.org/networking/iproute2";
     description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
     platforms = platforms.linux;
     license = licenses.gpl2;