From e592a523114e3f2d02d61717e4cb9c514710c3db Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Sun, 20 Oct 2024 21:12:09 +1100 Subject: [PATCH 1/2] Substitute reference to `elixir` --- pkgs/development/beam-modules/elixir-ls/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 8d4eba70cc00..cfda8d21a495 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -56,7 +56,8 @@ mixRelease { substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ "ERL_LIBS=$out/lib:\$ERL_LIBS" \ - --replace "exec elixir" "exec ${elixir}/bin/elixir" + --replace "exec elixir" "exec ${elixir}/bin/elixir" \ + --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir" runHook postInstall ''; From 435051f990d1cbf724a8973e6d8449f686cba18f Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Sun, 20 Oct 2024 21:32:10 +1100 Subject: [PATCH 2/2] Also patch `zsh` launcher --- pkgs/development/beam-modules/elixir-ls/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index cfda8d21a495..3bf8c57b7543 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -52,12 +52,14 @@ mixRelease { substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-debug-adapter - # prepare the launcher + # prepare the launchers substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ "ERL_LIBS=$out/lib:\$ERL_LIBS" \ --replace "exec elixir" "exec ${elixir}/bin/elixir" \ --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir" + substituteInPlace $out/lib/exec.zsh \ + --replace "exec elixir" "exec ${elixir}/bin/elixir" runHook postInstall '';