Skip to content

Commit 582db43

Browse files
ejabberd: use beamPackages for rebar3WithPlugins (NixOS#372942)
2 parents 69930db + 85d43a1 commit 582db43

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkgs/by-name/ej/ejabberd/package.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
gd,
1818
autoreconfHook,
1919
gawk,
20-
rebar3WithPlugins,
2120
fetchFromGitHub,
2221
fetchgit,
23-
fetchHex,
2422
beamPackages,
2523
nixosTests,
2624
withMysql ? false,
@@ -40,6 +38,8 @@
4038
}:
4139

4240
let
41+
inherit (beamPackages) buildRebar3 fetchHex rebar3WithPlugins;
42+
4343
ctlpath = lib.makeBinPath [
4444
bash
4545
gnused
@@ -50,7 +50,7 @@ let
5050
procps
5151
];
5252

53-
provider_asn1 = beamPackages.buildRebar3 {
53+
provider_asn1 = buildRebar3 {
5454
name = "provider_asn1";
5555
version = "0.3.0";
5656
src = fetchHex {
@@ -60,7 +60,7 @@ let
6060
};
6161
beamDeps = [ ];
6262
};
63-
rebar3_hex = beamPackages.buildRebar3 {
63+
rebar3_hex = buildRebar3 {
6464
name = "rebar3_hex";
6565
version = "7.0.7";
6666
src = fetchHex {
@@ -73,7 +73,7 @@ let
7373

7474
allBeamDeps = import ./rebar-deps.nix {
7575
inherit fetchHex fetchgit fetchFromGitHub;
76-
builder = lib.makeOverridable beamPackages.buildRebar3;
76+
builder = lib.makeOverridable buildRebar3;
7777

7878
overrides = final: prev: {
7979
jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; };

0 commit comments

Comments
 (0)