diff options
| author | David <dlesl@users.noreply.github.com> | 2021-05-08 13:47:27 +0200 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-05-11 08:59:57 +0900 |
| commit | dcc075ce21152964f8107e0ddf5140723e881e2b (patch) | |
| tree | ca46afe85c8afa1e13c5cb4a63804fd6e099c20a /pkgs/development/beam-modules | |
| parent | aaa16732ce3d3001e238eb4074cd68b8f300f77f (diff) | |
| download | nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.tar nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.tar.gz nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.tar.bz2 nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.tar.lz nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.tar.xz nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.tar.zst nixpkgs-dcc075ce21152964f8107e0ddf5140723e881e2b.zip | |
buildRebar3: use rebar3WithPlugins
Diffstat (limited to 'pkgs/development/beam-modules')
| -rw-r--r-- | pkgs/development/beam-modules/build-rebar3.nix | 13 |
1 files changed, 6 insertions, 7 deletions
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" '' |