diff options
| author | Shane Sveller <shanesveller@gmail.com> | 2023-06-19 08:47:00 -0500 |
|---|---|---|
| committer | Yt <happysalada@tuta.io> | 2023-06-19 10:53:45 -0400 |
| commit | bf2e7265e3fd397c85f6858d873844e59048ae68 (patch) | |
| tree | 7c9ad71fb66678e3014eb84cc56b06e1fe3189b4 | |
| parent | ba36bdc1eaef9c667d1b988c50ce10bf535cc548 (diff) | |
| download | nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.tar nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.tar.gz nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.tar.bz2 nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.tar.lz nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.tar.xz nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.tar.zst nixpkgs-bf2e7265e3fd397c85f6858d873844e59048ae68.zip | |
elixir: Locate generate_app.escript via defaulted argument
| -rw-r--r-- | pkgs/development/interpreters/elixir/1.15.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/elixir/generic-builder.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix index 0285616f7ea..6dada168cc3 100644 --- a/pkgs/development/interpreters/elixir/1.15.nix +++ b/pkgs/development/interpreters/elixir/1.15.nix @@ -4,4 +4,5 @@ mkDerivation { sha256 = "sha256-o5MfA0UG8vpnPCH1EYspzcN62yKZQcz5uVUY47hOL9w="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; + escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 5f08386c9f5..af698215610 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -16,6 +16,7 @@ , sha256 ? null , rev ? "v${version}" , src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; } +, escriptPath ? "lib/elixir/generate_app.escript" } @ args: let @@ -38,7 +39,7 @@ stdenv.mkDerivation ({ buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; preBuild = '' - patchShebangs lib/elixir/generate_app.escript || true + patchShebangs ${escriptPath} || true substituteInPlace Makefile \ --replace "/usr/local" $out |