Merge pull request #12444 from erlang-nix/propagate-build-plugins

Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3

Changed files
+8 -6
pkgs
development
erlang-modules
tools
build-managers
rebar3
+7 -4
pkgs/development/erlang-modules/build-rebar3.nix
···
{ name, version
, src
, setupHook ? null
-
, buildInputs ? [], erlangDeps ? [], pluginDeps ? []
, postPatch ? ""
, compilePorts ? false
, installPhase ? null
···
with stdenv.lib;
let
-
plugins = pluginDeps ++ (if compilePorts then [pc] else []);
-
shell = drv: stdenv.mkDerivation {
name = "interactive-shell-${drv.name}";
···
inherit version;
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
-
propagatedBuildInputs = erlangDeps ++ plugins;
inherit src;
···
{ name, version
, src
, setupHook ? null
+
, buildInputs ? [], erlangDeps ? [], buildPlugins ? []
, postPatch ? ""
, compilePorts ? false
, installPhase ? null
···
with stdenv.lib;
let
+
ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);
shell = drv: stdenv.mkDerivation {
name = "interactive-shell-${drv.name}";
···
inherit version;
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
+
propagatedBuildInputs = unique (erlangDeps ++ ownPlugins);
+
+
# The following are used by rebar3-nix-bootstrap
+
inherit compilePorts;
+
buildPlugins = ownPlugins;
inherit src;
+1 -2
pkgs/development/tools/build-managers/rebar3/default.nix
···
patches = [ ./hermetic-bootstrap.patch ];
buildInputs = [ erlang tree ];
-
propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];
-
postPatch = ''
echo postPatch
···
patches = [ ./hermetic-bootstrap.patch ];
buildInputs = [ erlang tree ];
+
propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];
postPatch = ''
echo postPatch