* 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
This commit is contained in:
@@ -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}";
|
||||
}
|
||||
|
||||
@@ -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}";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user