ErlangR24: init at 24.0
Update configure options The configure script now needs to be told about the headers and the actual lib files separately. Remove extra whitespace
This commit is contained in:
parent
39167dd014
commit
7500267ed9
4 changed files with 26 additions and 2 deletions
8
pkgs/development/interpreters/erlang/R24.nix
Normal file
8
pkgs/development/interpreters/erlang/R24.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "24.0";
|
||||
sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w";
|
||||
}
|
|
@ -76,7 +76,8 @@ in stdenv.mkDerivation ({
|
|||
./otp_build autoconf
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ]
|
||||
configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]
|
||||
++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24
|
||||
++ optional enableThreads "--enable-threads"
|
||||
++ optional enableSmpSupport "--enable-smp-support"
|
||||
++ optional enableKernelPoll "--enable-kernel-poll"
|
||||
|
|
|
@ -11874,7 +11874,7 @@ in
|
|||
beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
|
||||
erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
|
||||
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
|
||||
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7
|
||||
elixir_ls;
|
||||
|
|
|
@ -14,6 +14,21 @@ rec {
|
|||
|
||||
# Standard Erlang versions, using the generic builder.
|
||||
|
||||
# R24
|
||||
erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
|
||||
wxGTK = wxGTK30;
|
||||
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
|
||||
parallelBuild = true;
|
||||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport;
|
||||
};
|
||||
erlangR24_odbc = erlangR24.override { odbcSupport = true; };
|
||||
erlangR24_javac = erlangR24.override { javacSupport = true; };
|
||||
erlangR24_odbc_javac = erlangR24.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# R23
|
||||
erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {
|
||||
wxGTK = wxGTK30;
|
||||
|
|
Loading…
Reference in a new issue