From 7500267ed9a32cd9799f616e811fa306ed70a950 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Wed, 12 May 2021 09:27:31 -0400 Subject: 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 --- pkgs/top-level/beam-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'pkgs/top-level/beam-packages.nix') diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index ac9d4ab524e3a..dc338fc683ef8 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -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; -- cgit 1.4.1