diff options
author | Malcolm <mmatalka@gmail.com> | 2012-11-11 16:34:10 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-11-11 20:38:53 +0100 |
commit | 4fbd441418a260df7631f9375ee2cc034f5cea51 (patch) | |
tree | cf7c9ce70e8ac2471c6f8171c2554c50d365e749 /pkgs/development/interpreters/erlang | |
parent | 0757af169304b4987754acb7e8589d8fbf1338e1 (diff) |
Adding Erlang R15B02
Diffstat (limited to 'pkgs/development/interpreters/erlang')
-rw-r--r-- | pkgs/development/interpreters/erlang/R15B01.nix | 28 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/default.nix | 4 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/erlang/R15B01.nix b/pkgs/development/interpreters/erlang/R15B01.nix new file mode 100644 index 0000000000000..18cfeca63294f --- /dev/null +++ b/pkgs/development/interpreters/erlang/R15B01.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl +, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: + +assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; + +let version = "R15B01"; in + +stdenv.mkDerivation { + name = "erlang-" + version; + + src = fetchurl { + url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; + sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; + }; + + buildInputs = + [ perl gnum4 ncurses openssl + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + + preConfigure = '' + export HOME=$PWD/../ + sed -e s@/bin/pwd@pwd@g -i otp_build + ''; + + configureFlags = "--with-ssl=${openssl}"; +} diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 18cfeca63294f..50d818e1bb1ab 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -3,14 +3,14 @@ assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; -let version = "R15B01"; in +let version = "R15B02"; in stdenv.mkDerivation { name = "erlang-" + version; src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; - sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; + sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158"; }; buildInputs = |