From 5a558ea4d9a99f10440dfdb738e726ea09be51dd Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Mon, 14 Sep 2020 12:48:14 -0400 Subject: [PATCH 1/2] build-erlang-mk: add support for buildFlags --- pkgs/development/beam-modules/build-erlang-mk.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index 4dedf782b753..4ea8a52601c6 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -12,6 +12,7 @@ , configurePhase ? null , meta ? {} , enableDebugInfo ? false +, buildFlags ? [] , ... }@attrs: with stdenv.lib; @@ -42,6 +43,10 @@ let 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 '' From 8ddc83c67fb5d962cdf898aa21e77bad6860c894 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Tue, 15 Sep 2020 16:47:55 -0400 Subject: [PATCH 2/2] build-erlang-mk: preserve passed buildInputs --- pkgs/development/beam-modules/build-erlang-mk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index 4ea8a52601c6..c2d1ebabae27 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -40,7 +40,7 @@ let '' else setupHook; - buildInputs = [ erlang perl which gitMinimal wget ]; + buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ]; propagatedBuildInputs = beamDeps; buildFlags = [ "SKIP_DEPS=1" ]