diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
| commit | 66097104090e06c43a784193809bc8843a2ec052 (patch) | |
| tree | 021d726cde3c2dec5d4341340b37589feef3b15c /pkgs/development/interpreters/erlang | |
| parent | b4a3f99c7812a6c8bc34979200693b7010afffcc (diff) | |
* Get rid of many instances of "args: with args;", and other coding
guidelines violations. * Updated libsamplerate to 0.1.7. svn path=/nixpkgs/trunk/; revision=22782
Diffstat (limited to 'pkgs/development/interpreters/erlang')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R13B.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/interpreters/erlang/default.nix | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/R13B.nix b/pkgs/development/interpreters/erlang/R13B.nix index 37b78942dad77..05c8e1331abf4 100644 --- a/pkgs/development/interpreters/erlang/R13B.nix +++ b/pkgs/development/interpreters/erlang/R13B.nix @@ -1,18 +1,23 @@ -args: with args; +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: let version = "R13B"; in stdenv.mkDerivation { name = "erlang-" + version; + src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg"; }; - buildInputs = [perl gnum4 ncurses openssl]; + + buildInputs = [ perl gnum4 ncurses openssl ]; + 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 b11ef944c382e..ec7438c234168 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -1,18 +1,23 @@ -args: with args; +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: let version = "R14A"; in stdenv.mkDerivation { name = "erlang-" + version; + src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; sha256 = "170n5p6al1bxwngdmafm1c6892xjxppb96gzgki9gfb0mla6li73"; }; - buildInputs = [perl gnum4 ncurses openssl]; + + buildInputs = [ perl gnum4 ncurses openssl ]; + 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}"; } |