* Merged r2372. backups/one-click@2549

svn path=/nixpkgs/branches/one-click/; revision=2373

2 files changed, 5 insertions, 13 deletions

diff --git a/pkgs/os-specific/linux/e2fsprogs/builder.sh b/pkgs/os-specific/linux/e2fsprogs/builder.sh
deleted file mode 100644
index bb285c8a89b38..0000000000000
--- a/pkgs/os-specific/linux/e2fsprogs/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-buildinputs="$gettext"
-. $stdenv/setup 
-
-tar xvfz $src 
-cd e2fsprogs-* 
-./configure --prefix=$out --enable-dynamic-e2fsck
-make 
-make install 
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index 23ec7be5b3d55..c0488b372d763 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation {
-  name = "e2fsprogs-1.34";
-  builder = ./builder.sh;
+  name = "e2fsprogs-1.36";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/e2fsprogs-1.34.tar.gz;
-    md5 = "9be9375224f0970a55e39ebebf2a0ce5";
+    url = http://heanet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.36.tar.gz;
+    md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
   };
-  inherit gettext;
+  configureFlags = "--enable-dynamic-e2fsck";
+  buildInputs = [gettext];
 }