From dcc075ce21152964f8107e0ddf5140723e881e2b Mon Sep 17 00:00:00 2001 From: David Date: Sat, 8 May 2021 13:47:27 +0200 Subject: buildRebar3: use rebar3WithPlugins --- pkgs/development/beam-modules/build-rebar3.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pkgs/development/beam-modules') diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 2e2f0a50b31..651c024db09 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, erlang, rebar3, openssl, libyaml, +{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, pc, lib }: { name, version @@ -19,7 +19,10 @@ with lib; let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; - ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []); + rebar3 = rebar3WithPlugins { + plugins = buildPlugins; + globalPlugins = (if compilePorts then [pc] else []); + }; shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.name}"; @@ -36,13 +39,9 @@ let inherit version; buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; - propagatedBuildInputs = unique (beamDeps ++ ownPlugins); + propagatedBuildInputs = unique beamDeps; dontStrip = true; - # The following are used by rebar3-nix-bootstrap - inherit compilePorts; - buildPlugins = ownPlugins; - inherit src; setupHook = writeText "setupHook.sh" '' -- cgit 1.4.1