From 845317e5d62f8e42155933a7c4c74eaca85eb94f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 31 Jul 2016 22:54:11 +0200
Subject: [PATCH] construo: remove use of `builderDefsPackage`

---
 pkgs/games/construo/default.nix | 49 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index f94b489908eb..7e4f3c58c310 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, builderDefs, libX11, zlib, xproto, mesa ? null, freeglut ? null }:
+{ stdenv, fetchurl, libX11, zlib, xproto, mesa ? null, freeglut ? null }:
 
-	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 ]
-                  ++ stdenv.lib.optional (mesa != null) mesa
-                  ++ stdenv.lib.optional (freeglut != null) freeglut;
-		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 = "Masses and springs simulation game";
-	};
+  name = "construo-0.2.2";
+
+  src = fetchurl {
+    url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz;
+    sha256 = "0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck";
+  };
+
+  buildInputs = [ libX11 zlib xproto ]
+    ++ stdenv.lib.optional (mesa != null) mesa
+    ++ stdenv.lib.optional (freeglut != null) freeglut;
+
+  preConfigure = ''
+    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
+  '';
+
+  meta = {
+    description = "Masses and springs simulation game";
+  };
 }