mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 09:34:36 +00:00
Making btrfsprogs build with glibc 2.12
svn path=/nixpkgs/branches/stdenv-updates/; revision=23701
This commit is contained in:
parent
a42e571e33
commit
1c35ff38d0
@ -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
|
||||
|
12
pkgs/tools/filesystems/btrfsprogs/glibc212.patch
Normal file
12
pkgs/tools/filesystems/btrfsprogs/glibc212.patch
Normal 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"
|
Loading…
Reference in New Issue
Block a user