diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-07 10:43:05 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-07 10:43:05 +0000 |
commit | dd184fa88dde3df5f3510a31bff0c09f2564da6a (patch) | |
tree | 740070e9957f0bd559dc4f12ea8347a3962367b3 /pkgs/development/interpreters/erlang | |
parent | 4b881c08e3f93d1a22864478b4e0c1cfa8fbedfe (diff) |
erlang and libsigsegv upgraded
svn path=/nixpkgs/branches/stdenv-updates/; revision=10537
Diffstat (limited to 'pkgs/development/interpreters/erlang')
-rw-r--r-- | pkgs/development/interpreters/erlang/R11B-5.nix | 12 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R12B-1.nix | 12 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/builder.sh | 14 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/default.nix | 11 |
4 files changed, 24 insertions, 25 deletions
diff --git a/pkgs/development/interpreters/erlang/R11B-5.nix b/pkgs/development/interpreters/erlang/R11B-5.nix new file mode 100644 index 0000000000000..68cc3b5f2b5d9 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R11B-5.nix @@ -0,0 +1,12 @@ +args: with args; + +stdenv.mkDerivation { + name = "erlang-" + version; + src = fetchurl { + url = http://www.erlang.org/download/otp_src_R11B-5.tar.gz; + md5 = "96acec41da87d6ee0ef18e1aab36ffdd"; + }; + buildInputs = [perl gnum4 ncurses openssl]; + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + configureFlags = "--with-ssl=${openssl}"; +} diff --git a/pkgs/development/interpreters/erlang/R12B-1.nix b/pkgs/development/interpreters/erlang/R12B-1.nix new file mode 100644 index 0000000000000..37ebdbf6ab8a4 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R12B-1.nix @@ -0,0 +1,12 @@ +args: with args; + +stdenv.mkDerivation { + name = "erlang-" + version; + src = fetchurl { + url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; + sha256 = "16w7snhbjzwiywppsp04yiy2bkncff8pf4i643kqzkqx578jhaqz"; + }; + buildInputs = [perl gnum4 ncurses openssl]; + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + configureFlags = "--with-ssl=${openssl}"; +} diff --git a/pkgs/development/interpreters/erlang/builder.sh b/pkgs/development/interpreters/erlang/builder.sh deleted file mode 100644 index 43c964d88b80c..0000000000000 --- a/pkgs/development/interpreters/erlang/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix deleted file mode 100644 index f8caed7f329b8..0000000000000 --- a/pkgs/development/interpreters/erlang/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{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; -} |