about summary refs log tree commit diff
path: root/pkgs/top-level/beam-packages.nix
diff options
context:
space:
mode:
authorJustin Wood <me@ankhers.dev>2021-05-12 09:27:31 -0400
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-05-13 11:48:19 -0700
commit7500267ed9a32cd9799f616e811fa306ed70a950 (patch)
tree2aa725b260e336ec8d68038d090d52b08c02f648 /pkgs/top-level/beam-packages.nix
parent39167dd01410d7793eac642cc631f4a8bff5f3be (diff)
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
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r--pkgs/top-level/beam-packages.nix15
1 files changed, 15 insertions, 0 deletions
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;