Merged with trunk again

svn path=/nixpkgs/branches/stdenv-updates/; revision=10267

pkgs/development/interpreters/erlang/builder.sh

@@ -0,0 +1,14 @@
+buildInputs="$perl $gnum4 $ncurses $openssl"
+
+source $stdenv/setup
+
+tar xfvz $src
+cd otp_src_*
+
+# Fix some hard coded paths to /bin/rm
+sed -i -e "s|/bin/rm|rm|" lib/odbc/configure
+sed -i -e "s|/bin/rm|rm|" erts/configure
+
+./configure --prefix=$out --with-ssl=$openssl
+make
+make install

pkgs/development/interpreters/erlang/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, perl, ncurses, gnum4, openssl}:
+
+stdenv.mkDerivation {
+  name = "erlang-R11B-5";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.erlang.org/download/otp_src_R11B-5.tar.gz;
+    md5 = "96acec41da87d6ee0ef18e1aab36ffdd";
+  };
+  inherit perl ncurses gnum4 openssl;
+}

pkgs/development/interpreters/pyrex/0.9.6.nix

@@ -1,5 +1,5 @@
 args : with args;
-	with builderDefs {
+	let localDefs = builderDefs {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.tar.gz;
@@ -8,10 +8,11 @@ args : with args;
 		buildInputs = [python];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "Pyrex-"+version;
 	builder = writeScript (name + "-builder")
-		(textClosure [installPythonPackage doForceShare]);
+		(textClosure localDefs [installPythonPackage doForceShare]);
 	meta = {
 		description = "
 	Python package compiler or something like that.