diff options
| author | Justin Wood <justin.k.wood@gmail.com> | 2017-06-22 21:17:25 -0400 |
|---|---|---|
| committer | Justin Wood <justin.k.wood@gmail.com> | 2017-06-26 23:13:58 -0400 |
| commit | 838956b179f786eb27a0d21eeddd5909f083ee29 (patch) | |
| tree | 59b403d43537e48c585114cb696e441cc9e1cba2 /pkgs/development/beam-modules | |
| parent | 019afb0c806301e03de764a77dcc11fcbc3fd77a (diff) | |
| download | nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.tar nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.tar.gz nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.tar.bz2 nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.tar.lz nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.tar.xz nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.tar.zst nixpkgs-838956b179f786eb27a0d21eeddd5909f083ee29.zip | |
Add erlang that is in scope
Diffstat (limited to 'pkgs/development/beam-modules')
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 12 |
1 files 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 { }; |