From 852603e4df04f8ffe2b5671ce3ac0308290184b3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 12 May 2009 16:00:26 +0000
Subject: [PATCH] Fix indent build

svn path=/nixpkgs/trunk/; revision=15572
---
 pkgs/development/tools/misc/indent/2.2.9.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix
index a3d800c81e9..df5aab7a313 100644
--- a/pkgs/development/tools/misc/indent/2.2.9.nix
+++ b/pkgs/development/tools/misc/indent/2.2.9.nix
@@ -1,4 +1,5 @@
 args : with args;
+	let bd = builderDefs; in
 	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
@@ -8,19 +9,17 @@ args : with args;
 
 		buildInputs = [];
 		configureFlags = [];
+		preBuild = bd.stringsWithDeps.fullDepEntry ("
+			sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h
+			sed -e '/extern FILE [*]output/a#endif' -i src/indent.h
+			sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c
+		") ["minInit" "doUnpack"];
 	};
 	in with localDefs;
-let 
-	preBuild = FullDepEntry ("
-		sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h
-		sed -e '/extern FILE [*]output/a#endif' -i src/indent.h
-		sed -e '1i#define OUTPUT_DEFINED_ELSEWHERE 1' -i src/output.c
-	") [minInit doUnpack];
-in
 stdenv.mkDerivation rec {
 	name = "indent";
 	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]);
+		(textClosure localDefs ["doConfigure" "preBuild" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
 		description = "GNU Indent - a source text formatter";
 		inherit src;