pyrox.dev
Merge pull request #12444 from erlang-nix/propagate-build-plugins
Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3
+7
-4
pkgs/development/erlang-modules/build-rebar3.nix
+7
-4
pkgs/development/erlang-modules/build-rebar3.nix
···
4
{ name, version
5
, src
6
, setupHook ? null
7
-
, buildInputs ? [], erlangDeps ? [], pluginDeps ? []
8
, postPatch ? ""
9
, compilePorts ? false
10
, installPhase ? null
···
14
with stdenv.lib;
15
16
let
17
-
plugins = pluginDeps ++ (if compilePorts then [pc] else []);
18
-
19
20
shell = drv: stdenv.mkDerivation {
21
name = "interactive-shell-${drv.name}";
···
28
inherit version;
29
30
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
31
-
propagatedBuildInputs = erlangDeps ++ plugins;
32
33
inherit src;
34
···
4
{ name, version
5
, src
6
, setupHook ? null
7
+
, buildInputs ? [], erlangDeps ? [], buildPlugins ? []
8
, postPatch ? ""
9
, compilePorts ? false
10
, installPhase ? null
···
14
with stdenv.lib;
15
16
let
17
+
ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);
18
19
shell = drv: stdenv.mkDerivation {
20
name = "interactive-shell-${drv.name}";
···
27
inherit version;
28
29
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
30
+
propagatedBuildInputs = unique (erlangDeps ++ ownPlugins);
31
+
32
+
# The following are used by rebar3-nix-bootstrap
33
+
inherit compilePorts;
34
+
buildPlugins = ownPlugins;
35
36
inherit src;
37
+1
-2
pkgs/development/tools/build-managers/rebar3/default.nix
+1
-2
pkgs/development/tools/build-managers/rebar3/default.nix