From 900f96fe8a6b60b24a55a5a58bc843666238019e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 7 Jul 2009 21:47:28 +0000 Subject: [PATCH] Build btrfs-image, although it was mistakenly omitted in release Makefile svn path=/nixpkgs/trunk/; revision=16226 --- pkgs/os-specific/linux/btrfsprogs/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/btrfsprogs/default.nix b/pkgs/os-specific/linux/btrfsprogs/default.nix index c94080194e8..c49e16691f8 100644 --- a/pkgs/os-specific/linux/btrfsprogs/default.nix +++ b/pkgs/os-specific/linux/btrfsprogs/default.nix @@ -17,9 +17,14 @@ rec { configureFlags = []; makeFlags = ["prefix=$out"]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall"]; + phaseNames = ["doEnsureBtrfsImage" "doMakeInstall"]; + doEnsureBtrfsImage = a.fullDepEntry ('' + if ! grep 'progs = ' Makefile | grep btrfs-image; then + sed -e 's/progs = .*/& btrfs-image/' -i Makefile + fi + '') ["minInit" "doUnpack"]; + name = "btrfs-progs-" + version; meta = { description = "BTRFS utilities";