swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Making btrfsprogs build with glibc 2.12

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23701
This commit is contained in:
Lluís Batlle i Rossell 2010-09-09 17:07:28 +00:00
parent a42e571e33
commit 1c35ff38d0
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/tools/filesystems/btrfsprogs/default.nix
View file

@ -20,7 +20,8 @@ rec {
configureFlags = []; configureFlags = [];
makeFlags = ["prefix=$out"]; makeFlags = ["prefix=$out"];
phaseNames = ["doEnsureBtrfsImage" "doMakeInstall"]; patches = [ ./glibc212.patch ];
phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
doEnsureBtrfsImage = a.fullDepEntry ('' doEnsureBtrfsImage = a.fullDepEntry (''
if ! grep 'progs = ' Makefile | grep btrfs-image; then if ! grep 'progs = ' Makefile | grep btrfs-image; then

12
pkgs/tools/filesystems/btrfsprogs/glibc212.patch Normal file
View file

@ -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"