Fix construo build

svn path=/nixpkgs/trunk/; revision=15573

1 files changed, 8 insertions, 10 deletions

diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix
index 9d929afc7c98..2080bb344ea4 100644
--- a/pkgs/games/construo/0.2.2.nix
+++ b/pkgs/games/construo/0.2.2.nix
@@ -10,21 +10,19 @@ args : with args;
 		++ (if args ? mesa then [args.mesa args.freeglut] else [])
 		;
 		configureFlags = [""];
+		preConfigure = builderDefs.stringsWithDeps.FullDepEntry (''
+		  sed -e 's/math[.]h/cmath/' -i vector.cxx
+		  sed -e 's/games/bin/' -i Makefile.in
+		  sed -e '1i\#include <stdlib.h>' -i construo_main.cxx -i command_line.cxx -i config.hxx
+		  sed -e '1i\#include <string.h>' -i command_line.cxx -i lisp_reader.cxx -i unix_system.cxx \
+		      -i world.cxx construo_main.cxx
+		'') ["doUnpack" "minInit"];
 	};
 	in with localDefs;
-let 
-preConfigure = FullDepEntry (''
-  sed -e 's/math[.]h/cmath/' -i vector.cxx
-  sed -e 's/games/bin/' -i Makefile.in
-  sed -e '1i\#include <stdlib.h>' -i construo_main.cxx -i command_line.cxx -i config.hxx
-  sed -e '1i\#include <string.h>' -i command_line.cxx -i lisp_reader.cxx -i unix_system.cxx \
-      -i world.cxx construo_main.cxx
-'') [doUnpack minInit];
-in
 stdenv.mkDerivation rec {
 	name = "construo-"+version;
 	builder = writeScript (name + "-builder")
-		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
+		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
 		description = "Construo masses and springs simulation";
 		inherit src;