Ported ffmpeg_svn tarball link; fixes to iptables

svn path=/nixpkgs/branches/stdenv-updates/; revision=10651

4 files changed, 36 insertions, 16 deletions

diff --git a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
index 5cfb90e48584..1c7d07aedd8e 100644
--- a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
+++ b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
@@ -2,10 +2,9 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "ffmpeg-svn-2007-12-04";
-  src = fetchsvn {
-    url = svn://svn.mplayerhq.hu/ffmpeg/trunk ;
-    rev = "11164";
-    sha256 = "80d3b3311abaf8343b73c711f02d269e8c87991f2c3d0f08e32309d39ad6aa3b";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/ffmpeg-svn-r11901.tar.bz2;
+    sha256 = "0l5207gnfaz57pvlxpxyjphyz0mp9plnxzd0aghy0nz3hmqh4rs7";
   };
 
   propagatedBuildInputs = [ a52dec lame libtheora x11 zlib SDL];
diff --git a/pkgs/os-specific/linux/iptables/1.4.0.nix b/pkgs/os-specific/linux/iptables/1.4.0.nix
new file mode 100644
index 000000000000..ba4fbd06db89
--- /dev/null
+++ b/pkgs/os-specific/linux/iptables/1.4.0.nix
@@ -0,0 +1,29 @@
+args : with args; with builderDefs {src="";} null;
+  let localDefs = builderDefs (rec {
+    src = /* put a fetchurl here */
+    fetchurl {
+      url = http://www.netfilter.org/projects/iptables/files/iptables-1.4.0.tar.bz2;
+      sha256 = "0ljxbvdlg5mfxk0y00dr0qvsri1d495ci1pr8hrzga766n09g6px";
+    };
+
+    buildInputs = [];
+    configureFlags = [];
+    makeFlags = [
+      " KERNEL_DIR=${kernelHeaders} "
+    ];
+    preBuild = FullDepEntry (''
+      sed -e 's@/usr/local@'$out'@' -i Makefile Rules.make
+    '') ["doUnpack" "minInit"];
+  }) null; /* null is a terminator for sumArgs */
+  in with localDefs;
+stdenv.mkDerivation rec {
+  name = "iptables-"+version;
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [preBuild doMakeInstall doForceShare doPropagate]);
+  meta = {
+    description = "
+     IPtables Linux firewall.
+";
+  };
+}
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
deleted file mode 100644
index 606cf7796f90..000000000000
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "iptables-1.3.7";
-  src = fetchurl {
-    url = http://www.netfilter.org/projects/iptables/files/iptables-1.3.7.tar.bz2;
-    sha256 = "00nffc03akgm5p0skz90nl29h5d8b9fjc0d9lhipkbwy0ahcw00f";
-  };
-  preBuild = "makeFlagsArray=(PREFIX=$out)";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f7127e791f3..4567484777ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3419,10 +3419,12 @@ rec {
     kernelHeaders = stdenv.gcc.libc.kernelHeaders;
   };
 
-  iptables = import ../os-specific/linux/iptables {
-    inherit fetchurl stdenv;
+  iptablesFun = lib.sumArgs (selectVersion ../os-specific/linux/iptables "1.4.0") {
+    inherit builderDefs kernelHeaders;
   };
 
+  iptables = iptablesFun null;
+
   ipw2200fw = import ../os-specific/linux/firmware/ipw2200 {
     inherit fetchurl stdenv;
   };