3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #26764 from mdaiter/erlangR20

erlangR20: init
This commit is contained in:
Daiderd Jordan 2017-06-23 19:37:49 +02:00 committed by GitHub
commit b0b5911fc1
3 changed files with 20 additions and 1 deletions

View file

@ -0,0 +1,10 @@
{ mkDerivation, fetchurl }:
mkDerivation rec {
version = "20.0";
sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
'';
}

View file

@ -5995,7 +5995,8 @@ with pkgs;
erlang_basho_R16B02 erlang_basho_R16B02_odbc
erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac
erlangR20;
inherit (beam.packages.erlang)
rebar rebar3-open rebar3

View file

@ -37,6 +37,14 @@ rec {
erlangR19_odbc_javac = erlangR19.override {
javacSupport = true; odbcSupport = true;
};
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
wxGTK = wxGTK30;
};
erlangR20_odbc = erlangR20.override { odbcSupport = true; };
erlangR20_javac = erlangR20.override { javacSupport = true; };
erlangR20_odbc_javac = erlangR20.override {
javacSupport = true; odbcSupport = true;
};
# Bash fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {