Remove defaultScope in favour of rec for elixir versions

Also removed superfluous path segments from elixir generic builder

2 files changed, 5 insertions, 7 deletions

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 07cc2ebd94b..69265aa53e4 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -16,7 +16,7 @@ let
     in
       import ./hex-packages.nix {
         inherit pkgs stdenv callPackage;
-      } // {
+      } // rec {
         inherit callPackage erlang;
         beamPackages = self;
 
@@ -37,18 +37,16 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = defaultScope.elixir-1_4;
+        elixir = elixir-1_4;
 
         elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
+                       inherit rebar erlang;
                        debugInfo = true;
-                       erlang = erlang;
-                       rebar = defaultScope.rebar;
                      };
 
         elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
+                       inherit rebar erlang;
                        debugInfo = true;
-                       erlang = erlang;
-                       rebar = defaultScope.rebar;
                      };
 
         lfe = callPackage ../interpreters/lfe { };
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index df0af405763..8a93282d1ec 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -60,7 +60,7 @@ rec {
   callElixir = drv: vsn: args:
     let
       inherit (stdenv.lib) versionAtLeast;
-      builder = callPackage ../../development/interpreters/elixir/generic-builder.nix args;
+      builder = callPackage ../interpreters/elixir/generic-builder.nix args;
     in
       if versionAtLeast (getVersion args.erlang) vsn
       then