From 838956b179f786eb27a0d21eeddd5909f083ee29 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Thu, 22 Jun 2017 21:17:25 -0400 Subject: [PATCH] Add erlang that is in scope --- pkgs/development/beam-modules/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 26cba333c23..d54520212a5 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -40,11 +40,19 @@ let elixir = defaultScope.elixir-1_4; elixir-1_4 = if versionAtLeast (lib.getVersion erlang) "18" - then lib.callElixir ../interpreters/elixir/1.4.nix { debugInfo = true; } + then + lib.callElixir ../interpreters/elixir/1.4.nix { + debugInfo = true; + erlang = erlang; + } else throw "Elixir requires at least Erlang/OTP R18."; elixir-1_3 = if versionAtLeast (lib.getVersion erlang) "18" - then lib.callElixir ../interpreters/elixir/1.3.nix { debugInfo = true; } + then + lib.callElixir ../interpreters/elixir/1.3.nix { + debugInfo = true; + erlang = erlang; + } else throw "Elixir requires at least Erlang/OTP R18."; lfe = callPackage ../interpreters/lfe { };