From 51aa419354ab297e80a105a0b85ff3f4c378f05a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 20 Sep 2017 22:56:06 +0800
Subject: [PATCH] erlang: introduce "no X" variation

---
 pkgs/top-level/all-packages.nix  | 2 +-
 pkgs/top-level/beam-packages.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ef812b388d1..fd36557c6db5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6295,7 +6295,7 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlangR17 erlangR18 erlangR19 erlangR20
-    erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
+    erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
     elixir elixir_1_5 elixir_1_4 elixir_1_3
     lfe lfe_1_2;
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index fd2a55691712..bffd86da52e7 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -6,11 +6,12 @@ rec {
   # Each
   interpreters = rec {
 
-    # R18 is the default version.
+    # R19 is the default version.
     erlang = erlangR19; # The main switch to change default Erlang version.
     erlang_odbc = erlangR19_odbc;
     erlang_javac = erlangR19_javac;
     erlang_odbc_javac = erlangR19_odbc_javac;
+    erlang_nox = erlangR19_nox;
 
     # These are standard Erlang versions, using the generic builder.
     erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};
@@ -21,6 +22,7 @@ rec {
     erlangR17_odbc_javac = erlangR17.override {
       javacSupport = true; odbcSupport = true;
     };
+    erlangR17_nox = erlangR17.override { wxSupport = false; };
     erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
       wxGTK = wxGTK30;
     };
@@ -29,6 +31,7 @@ rec {
     erlangR18_odbc_javac = erlangR18.override {
       javacSupport = true; odbcSupport = true;
     };
+    erlangR18_nox = erlangR18.override { wxSupport = false; };
     erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
       wxGTK = wxGTK30;
     };
@@ -37,6 +40,7 @@ rec {
     erlangR19_odbc_javac = erlangR19.override {
       javacSupport = true; odbcSupport = true;
     };
+    erlangR19_nox = erlangR19.override { wxSupport = false; };
     erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
       wxGTK = wxGTK30;
     };
@@ -45,6 +49,7 @@ rec {
     erlangR20_odbc_javac = erlangR20.override {
       javacSupport = true; odbcSupport = true;
     };
+    erlangR20_nox = erlangR20.override { wxSupport = false; };
 
     # Bash fork, using custom builder.
     erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {