public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix btrfs-progs build

Browse Source 
http://hydra.nixos.org/build/2842473
This commit is contained in:
Eelco Dolstra 2012-07-18 09:21:33 -04:00
parent 24f7a2b72b
commit b9b5a8d7c1
2 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

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