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

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

+8 -6
+7 -4
pkgs/development/erlang-modules/build-rebar3.nix
··· 4 4 { name, version 5 5 , src 6 6 , setupHook ? null 7 - , buildInputs ? [], erlangDeps ? [], pluginDeps ? [] 7 + , buildInputs ? [], erlangDeps ? [], buildPlugins ? [] 8 8 , postPatch ? "" 9 9 , compilePorts ? false 10 10 , installPhase ? null ··· 14 14 with stdenv.lib; 15 15 16 16 let 17 - plugins = pluginDeps ++ (if compilePorts then [pc] else []); 18 - 17 + ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []); 19 18 20 19 shell = drv: stdenv.mkDerivation { 21 20 name = "interactive-shell-${drv.name}"; ··· 28 27 inherit version; 29 28 30 29 buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; 31 - propagatedBuildInputs = erlangDeps ++ plugins; 30 + propagatedBuildInputs = unique (erlangDeps ++ ownPlugins); 31 + 32 + # The following are used by rebar3-nix-bootstrap 33 + inherit compilePorts; 34 + buildPlugins = ownPlugins; 32 35 33 36 inherit src; 34 37
+1 -2
pkgs/development/tools/build-managers/rebar3/default.nix
··· 81 81 patches = [ ./hermetic-bootstrap.patch ]; 82 82 83 83 buildInputs = [ erlang tree ]; 84 - propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ]; 85 - 84 + propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ]; 86 85 87 86 postPatch = '' 88 87 echo postPatch