From 682e6b0f9e94d158be1818ffc882faf88d561b9b Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Wed, 24 Aug 2022 14:41:30 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20redbug=20build=20error=20with=20Erlan?= =?UTF-8?q?g/OTP=20=E2=89=A5=2025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/beam-modules/erlang-ls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index a2739e4b6f6..4bd4a43b783 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -11,6 +11,9 @@ let proper = super.proper.overrideAttrs (_: { configurePhase = "true"; }); + redbug = super.redbug.overrideAttrs (_: { + patchPhase = "sed -i 's/, warnings_as_errors//' rebar.config"; + }); }); }; in From bbe876ee06ec27e3f9e815584c484d5321556dfe Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Wed, 24 Aug 2022 21:54:09 +0200 Subject: [PATCH 2/2] Use `substituteInPlace` instead of calling sed --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 4bd4a43b783..9a54ab8445c 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -12,7 +12,9 @@ let configurePhase = "true"; }); redbug = super.redbug.overrideAttrs (_: { - patchPhase = "sed -i 's/, warnings_as_errors//' rebar.config"; + patchPhase = '' + substituteInPlace rebar.config --replace ", warnings_as_errors" "" + ''; }); }); };