From 1c35ff38d094a2ec7f051e2619b0fed0624a86c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 9 Sep 2010 17:07:28 +0000
Subject: [PATCH] Making btrfsprogs build with glibc 2.12

svn path=/nixpkgs/branches/stdenv-updates/; revision=23701
---
 pkgs/tools/filesystems/btrfsprogs/default.nix    |  3 ++-
 pkgs/tools/filesystems/btrfsprogs/glibc212.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/filesystems/btrfsprogs/glibc212.patch

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 377f9591975..2a5574a829e 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -20,7 +20,8 @@ rec {
   configureFlags = [];
   makeFlags = ["prefix=$out"];
 
-  phaseNames = ["doEnsureBtrfsImage" "doMakeInstall"];
+  patches = [ ./glibc212.patch ];
+  phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
       
   doEnsureBtrfsImage = a.fullDepEntry (''
     if ! grep 'progs = ' Makefile | grep btrfs-image; then 
diff --git a/pkgs/tools/filesystems/btrfsprogs/glibc212.patch b/pkgs/tools/filesystems/btrfsprogs/glibc212.patch
new file mode 100644
index 00000000000..8bc1873f540
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfsprogs/glibc212.patch
@@ -0,0 +1,12 @@
+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"