2 files changed, 13 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix b/infra/libkookie/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
index 4dedf782b753..c2d1ebabae27 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -12,6 +12,7 @@
 , configurePhase ? null
 , meta ? {}
 , enableDebugInfo ? false
+, buildFlags ? []
 , ... }@attrs:
 
 with stdenv.lib;
@@ -39,9 +40,13 @@ let
     ''
     else setupHook;
 
-    buildInputs = [ erlang perl which gitMinimal wget ];
+    buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ];
     propagatedBuildInputs = beamDeps;
 
+    buildFlags = [ "SKIP_DEPS=1" ]
+      ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"''
+      ++ buildFlags;
+
     configurePhase = if configurePhase == null
     then ''
       runHook preConfigure
@@ -58,7 +63,7 @@ let
     then ''
         runHook preBuild
 
-        make SKIP_DEPS=1 ERL_OPTS="$ERL_OPTS ${debugInfoFlag}"
+        make $buildFlags "''${buildFlagsArray[@]}"
 
         runHook postBuild
     ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/beam-modules/default.nix b/infra/libkookie/nixpkgs/pkgs/development/beam-modules/default.nix
index 7fbec79cbd46..a5de4dfb3bba 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/beam-modules/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/beam-modules/default.nix
@@ -36,7 +36,12 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir_1_10;
+        elixir = elixir_1_11;
+
+        elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix {
+          inherit erlang;
+          debugInfo = true;
+        };
 
         elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
           inherit erlang;