diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 08:07:11 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 08:07:11 +0100 |
| commit | 3d4fc910f73220f47e5f2459853333a7c83c5d1d (patch) | |
| tree | d3178f93b78b3629dc7067cef69cf2a95490966d /gnu/packages/elixir.scm | |
| parent | 9160cccd767cdfa55f7a460750c6b0f7544c12eb (diff) | |
| parent | 4a0549be52f3f46fbce61342d8de30f7b83130c5 (diff) | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/elixir.scm')
| -rw-r--r-- | gnu/packages/elixir.scm | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index ef8c39d0d7..2885ddbd61 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -7,6 +7,8 @@ ;;; Copyright © 2018 Nikita <nikita@n0.is> ;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee> ;;; Copyright © 2021 Cees de Groot <cg@evrl.com> +;;; Copyright © 2024 Andrew Tropin <andrew@trop.in> +;;; Copyright © 2024 Ivan Sokolov <ivan-p-sokolov@ya.ru> ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,12 +103,26 @@ (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (programs '("elixir" "elixirc" "iex" "mix"))) + (programs '("elixir" "elixirc" "iex"))) + ;; mix can be sourced as an elixir script by other elixir + ;; program, for example `iex -S mix`, so we should not wrap + ;; mix into shell script. + (substitute* (string-append out "/bin/mix") + (("Mix.start\\(\\)") + (format #f "\ +~~w[GUIX_ELIXIR_LIBS ERL_LIBS] +|> Enum.map(&System.get_env/1) +|> Enum.reject(&is_nil/1) +|> Enum.join(\":\") +|> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end +System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\")) +Mix.start()" + (search-input-file inputs "/bin/rebar3")))) (for-each (lambda (program) (wrap-program (string-append out "/bin/" program) '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}")))) programs))))))) - (inputs (list erlang git)) + (inputs (list erlang rebar3 git)) (native-search-paths (list (search-path-specification (variable "GUIX_ELIXIR_LIBS") |