From 67de843bce289e616183c0ec5ce8b24b670ee9bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Jan 2013 13:34:56 +0100
Subject: ebtables: Update to 2.0.10-4 and fix build

http://hydra.nixos.org/build/3891670
---
 pkgs/os-specific/linux/ebtables/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'pkgs/os-specific/linux/ebtables/default.nix')

diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix
index 1f0539add939..eec456ff5ad2 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/pkgs/os-specific/linux/ebtables/default.nix
@@ -1,22 +1,27 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ebtables-2.0.9-2";
+  name = "ebtables-${version}";
+  version = "2.0.10-4";
 
   src = fetchurl {
-    url = mirror://sourceforge/ebtables/ebtables-v2.0.9-2.tar.gz;
-    sha256 = "18yni9zzhfi1ygkgifzj8qpn95cwwiw7j6b3wsl1bij39mj5z1cq";
+    url = "mirror://sourceforge/ebtables/ebtables-v${version}.tar.gz";
+    sha256 = "0pa5ljlk970yfyhpf3iqwfpbc30j8mgn90fapw9cfz909x47nvyw";
   };
 
   makeFlags =
-    "LIBDIR=$(out)/lib BINDIR=$(out)/sbin MANDIR=$(out)/share/man " +
-    "ETCDIR=$(out)/etc INITDIR=$(TMPDIR) SYSCONFIGDIR=$(out)/etc/sysconfig";
+    [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man"
+      "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig"
+      "LOCALSTATEDIR=/var"
+    ];
 
   preBuild =
     ''
       substituteInPlace Makefile --replace '-o root -g root' ""
     '';
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   preInstall = "mkdir -p $out/etc/sysconfig";
 
   meta = {
-- 
cgit 1.4.1