public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erlang: drop the leading 'R' from the Erlang version number so that nix-env recognizes it and allows "nix-env -i erlang" to work

Browse Source
This commit is contained in:
Peter Simons 2012-11-11 20:44:37 +01:00
parent 724d416fae
commit 73533ce2a0
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/erlang/R14B04.nix
View File

@ -1,23 +1,23 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: { stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
let version = "R14B04"; in let version = "14B04"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "erlang-" + version; name = "erlang-" + version;
src = fetchurl { src = fetchurl {
url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
}; };
buildInputs = [ perl gnum4 ncurses openssl ]; buildInputs = [ perl gnum4 ncurses openssl ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
preConfigure = '' preConfigure = ''
export HOME=$PWD/../ export HOME=$PWD/../
sed -e s@/bin/pwd@pwd@g -i otp_build sed -e s@/bin/pwd@pwd@g -i otp_build
''; '';
configureFlags = "--with-ssl=${openssl}"; configureFlags = "--with-ssl=${openssl}";
} }

16
pkgs/development/interpreters/erlang/R15B02.nix
View File

@ -3,26 +3,26 @@
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
let version = "R15B02"; in let version = "15B02"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "erlang-" + version; name = "erlang-" + version;
src = fetchurl { src = fetchurl {
url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; url = "http://www.erlang.org/download/otp_src_R{version}.tar.gz";
sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158"; sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158";
}; };
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl [ perl gnum4 ncurses openssl
] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
preConfigure = '' preConfigure = ''
export HOME=$PWD/../ export HOME=$PWD/../
sed -e s@/bin/pwd@pwd@g -i otp_build sed -e s@/bin/pwd@pwd@g -i otp_build
''; '';
configureFlags = "--with-ssl=${openssl}"; configureFlags = "--with-ssl=${openssl}";
} }