From ba498d4a43971c454a183e407e26e7803fbf8612 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Jul 2010 08:21:21 +0000
Subject: * composedArgsAndFun -> makeOverridable for consistency. * Rename a
 few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
---
 pkgs/games/construo/0.2.2.nix   | 30 ------------------------------
 pkgs/games/construo/default.nix | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/games/construo/0.2.2.nix
 create mode 100644 pkgs/games/construo/default.nix

(limited to 'pkgs/games/construo')

diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix
deleted file mode 100644
index 2b32020d8e9dc..0000000000000
--- a/pkgs/games/construo/0.2.2.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz;
-			sha256 = "0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck";
-		};
-
-		buildInputs = [libX11 zlib xproto]
-		++ (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;
-stdenv.mkDerivation rec {
-	name = "construo-0.2.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
-	meta = {
-		description = "Construo masses and springs simulation";
-		inherit src;
-	};
-}
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
new file mode 100644
index 0000000000000..2b32020d8e9dc
--- /dev/null
+++ b/pkgs/games/construo/default.nix
@@ -0,0 +1,30 @@
+args : with args;
+	let localDefs = builderDefs.passthru.function {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz;
+			sha256 = "0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck";
+		};
+
+		buildInputs = [libX11 zlib xproto]
+		++ (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;
+stdenv.mkDerivation rec {
+	name = "construo-0.2.2";
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
+	meta = {
+		description = "Construo masses and springs simulation";
+		inherit src;
+	};
+}
-- 
cgit 1.4.1