Fix btrfs-progs build

http://hydra.nixos.org/build/2842473

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,45 +1,24 @@
-a :
-let
-  fetchurl = a.fetchurl;
-  fetchgit = a.fetchgit;
+{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
 
-  version = a.lib.attrByPath ["version"] "0.19-20120328" a;
-  buildInputs = with a; [
-    zlib libuuid acl attr e2fsprogs
-  ];
-in
+let version = "0.19-20120328"; in
 
-assert a.libuuid != null;
+stdenv.mkDerivation {
+  name = "btrfs-progs-${version}";
 
-rec {
-  srcDrv = fetchgit {
-    url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
-    rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
-    sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
+    rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
+    sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
   };
 
-  src = srcDrv + "/";
+  buildInputs = [ zlib libuuid acl attr e2fsprogs ];
 
-  inherit buildInputs;
-  configureFlags = [];
-  makeFlags = ["prefix=$out CFLAGS=-Os"];
+  makeFlags = "prefix=$(out)";
 
-  patches = [];
-  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
-      sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile
-    fi
-  '') ["minInit" "doUnpack"];
-
-  name = "btrfs-progs-" + version;
   meta = {
-    description = "BTRFS utilities";
-    maintainers = [a.lib.maintainers.raskin];
+    description = "Utilities for the btrfs filesystem";
+    homepage = https://btrfs.wiki.kernel.org/;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -441,9 +441,7 @@ let
 
   bsod = callPackage ../misc/emulators/bsod { };
 
-  btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-    inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs;
-  };
+  btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
 
   catdoc = callPackage ../tools/text/catdoc { };