summary refs log tree commit diff
path: root/pkgs/top-level/beam-packages.nix
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-06-23 19:37:49 +0200
committerGitHub <noreply@github.com>2017-06-23 19:37:49 +0200
commitb0b5911fc14b90d279d54670dccf1484792f2ea0 (patch)
tree2a73543156c5d8d6b2fe1855b125eee08cd8cd41 /pkgs/top-level/beam-packages.nix
parentcb0851d5fa27282f5be2969a85cad6ed5a389d38 (diff)
parentd79b4766a5b123ec078045d9945c805c489e053b (diff)
downloadnixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar
nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.gz
nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.bz2
nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.lz
nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.xz
nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.zst
nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.zip
Merge pull request #26764 from mdaiter/erlangR20
erlangR20: init
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r--pkgs/top-level/beam-packages.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 9e0234ac1e23..6b97c0d131bc 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -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 {