summary refs log tree commit diff
path: root/pkgs/os-specific/linux/bridge-utils
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-11-15 14:17:56 -0800
committerWilliam A. Kennington III <william@wkennington.com>2014-11-15 14:18:19 -0800
commitc4ea8be9fab286ba8b15efd786d9f465d06bcd6d (patch)
treeb4a3bf92cc59f0103a52d98980b0eb2b790f4c80 /pkgs/os-specific/linux/bridge-utils
parent1a69d881747cda57bfa45be7c6f351d2d2e83d53 (diff)
downloadnixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.tar
nixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.tar.gz
nixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.tar.bz2
nixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.tar.lz
nixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.tar.xz
nixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.tar.zst
nixpkgs-c4ea8be9fab286ba8b15efd786d9f465d06bcd6d.zip
bridge-utils: Cleanup and add patch to correct for broken headers
Diffstat (limited to 'pkgs/os-specific/linux/bridge-utils')
-rw-r--r--pkgs/os-specific/linux/bridge-utils/default.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index 3b48b9ec211..2fdf728ef4e 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, autoconf, automake }:
+{ stdenv, fetchurl, autoreconfHook }:
 
-let
+stdenv.mkDerivation rec {
   name = "bridge-utils-1.5";
-in
-stdenv.mkDerivation {
-  inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/bridge/${name}.tar.gz";
     sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
   };
 
-  buildInputs = [ autoconf automake ];
+  # Remove patch once the kernel headers are updated
+  patches = [ ./add-ip6-header.patch ];
 
-  preConfigure = "autoreconf";
+  buildInputs = [ autoreconfHook ];
 
   postInstall = ''
     # The bridge utils build does not fail even if the brctl binary