Update BtrFS utilities to latest Git

svn path=/nixpkgs/trunk/; revision=30864

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,27 +1,35 @@
 a :
 let
   fetchurl = a.fetchurl;
+  fetchgit = a.fetchgit;
 
   version = a.lib.attrByPath ["version"] "0.19" a;
   buildInputs = with a; [
-    zlib libuuid acl
+    zlib libuuid acl attr
   ];
 in
 
 assert a.libuuid != null;
 
 rec {
-  src = fetchurl {
+  srcDrv = fetchgit {
-    url = "http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-${version}.tar.bz2";
+    url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
-    sha256 = "1z3hmfgv7h489gnh55abm0gzyf2cgjkybhfc2rnm0cvsx01xv8zq";
+    rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
+    sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
   };
 
+  src = srcDrv + "/";
+
   inherit buildInputs;
   configureFlags = [];
   makeFlags = ["prefix=$out CFLAGS=-Os"];
 
-  patches = [ ./glibc212.patch ];
+  patches = [];
-  phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
+  phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"];
+
+  fixMakefile = a.fullDepEntry ''
+    sed -e 's@^progs = @progs=@g' -i Makefile
+  '' ["minInit" "doUnpack"];
 
   doEnsureBtrfsImage = a.fullDepEntry (''
     if ! grep 'progs = ' Makefile | grep btrfs-image; then

pkgs/tools/filesystems/btrfsprogs/glibc212.patch

@@ -1,12 +0,0 @@
-diff --git a/btrfsck.c b/btrfsck.c
-index 73f1836..c1f47a1 100644
---- a/btrfsck.c
-+++ b/btrfsck.c
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/stat.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"