diff options
| author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
| commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
| tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/development/tools/build-managers/rebar3/default.nix | |
| parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
| parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
| download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip | |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/development/tools/build-managers/rebar3/default.nix')
| -rw-r--r-- | pkgs/development/tools/build-managers/rebar3/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 3b775eeaef1..f1aa4204a04 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 }: @@ -40,12 +40,14 @@ let ''; - patches = [] - # Skips test that can write outside the designated tmp directory, potentially resulting in build failures - # due to file ownership issues if ran without sandbox (eg. Mac M1 default). This patch can be Removed when - # rebar3 releases with the following commit: - # https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21 - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ./tmp-tests-skip.patch ]; + patches = [ + # TODO: remove this on next rebar3 release + (fetchpatch { + name = "escriptize-erl-libs"; + url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch"; + sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c"; + }) + ]; checkPhase = '' HOME=. escript ./rebar3 ct |