From ac9b6450210841b37702f2676c0ff3ca13503526 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 17 May 2021 17:43:09 +0200 Subject: [PATCH] rebar3: apply erlang/rebar3#2552 as patch --- .../tools/build-managers/rebar3/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 5867db0b573..68b593e3f5d 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchHex, erlang, makeWrapper, writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: @@ -21,6 +21,15 @@ let buildInputs = [ erlang ]; + patches = [ + # TODO: remove this on next rebar3 release + (fetchpatch { + name = "escriptize-erl-libs"; + url = "https://github.com/erlang/rebar3/commit/8049a92512420b0967a4c23acfa304d8ca7a712e.patch"; + sha256 = "0jzdy7n2nz4v38nn76bgjcmssvqgvdhy9v2gl867ylwqn1y5sdm1"; + }) + ]; + postPatch = '' mkdir -p _checkouts _build/default/lib/ @@ -100,7 +109,7 @@ let # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to # instruct rebar3 to always load a certain plugin. It is necessary since # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this. - patches = [ ./skip-plugins.patch ./global-plugins.patch ]; + patches = old.patches ++ [ ./skip-plugins.patch ./global-plugins.patch ]; })); in stdenv.mkDerivation { pname = "rebar3-with-plugins";