git.iko.soy/typeable/nixpkgs
on master help sign in
rebar3: apply erlang/rebar3#2552 as patch
commitac9b6450210841b37702f2676c0ff3ca13503526 authorDavid <dlesl@users.noreply.github.com> dateMon 17 May 2021, 17:43 (6 years ago) parentabfa431
1 file changed+11−2
pkgs/development/tools/build-managers/rebar3/default.nix+11−2
pkgs/development/tools/build-managers/rebar3/default.nix+11−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub,
1+{ lib, stdenv, fetchFromGitHub, fetchpatch,
22 fetchHex, erlang, makeWrapper,
33 writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
44
@@ -21,6 +21,15 @@ let
2121
2222 buildInputs = [ erlang ];
2323
24+ patches = [
25+ # TODO: remove this on next rebar3 release
26+ (fetchpatch {
27+ name = "escriptize-erl-libs";
28+ url = "https://github.com/erlang/rebar3/commit/8049a92512420b0967a4c23acfa304d8ca7a712e.patch";
29+ sha256 = "0jzdy7n2nz4v38nn76bgjcmssvqgvdhy9v2gl867ylwqn1y5sdm1";
30+ })
31+ ];
32+
2433 postPatch = ''
2534 mkdir -p _checkouts _build/default/lib/
2635
@@ -100,7 +109,7 @@ let
100109 # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to
101110 # instruct rebar3 to always load a certain plugin. It is necessary since
102111 # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this.
103− patches = [ ./skip-plugins.patch ./global-plugins.patch ];
112+ patches = old.patches ++ [ ./skip-plugins.patch ./global-plugins.patch ];
104113 }));
105114 in stdenv.mkDerivation {
106115 pname = "rebar3-with-plugins";