erlangR22: init at 22.0.4

This commit is contained in:
Erlend Hamberg 2019-06-18 10:56:32 +02:00 committed by Daiderd Jordan
parent 10a25e9b52
commit 19c2979677
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,11 @@
{ mkDerivation }:
mkDerivation rec {
version = "22.0.4";
sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10'
substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
'';
}

View File

@ -8233,7 +8233,7 @@ in
beam = callPackage ./beam-packages.nix { };
inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20 erlangR21
erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4
lfe lfe_1_2;

View File

@ -50,6 +50,15 @@ rec {
javacSupport = true; odbcSupport = true;
};
erlangR21_nox = erlangR21.override { wxSupport = false; };
erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {
wxGTK = wxGTK30;
};
erlangR22_odbc = erlangR22.override { odbcSupport = true; };
erlangR22_javac = erlangR22.override { javacSupport = true; };
erlangR22_odbc_javac = erlangR22.override {
javacSupport = true; odbcSupport = true;
};
erlangR22_nox = erlangR22.override { wxSupport = false; };
# Basho fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
@ -79,6 +88,7 @@ rec {
erlangR19 = packagesWith interpreters.erlangR19;
erlangR20 = packagesWith interpreters.erlangR20;
erlangR21 = packagesWith interpreters.erlangR21;
erlangR22 = packagesWith interpreters.erlangR22;
};
}