From eae65a197dc28c9eac6b6afad065d7853339ea6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 7 Jun 2021 14:21:15 +0200 Subject: [PATCH] beam/buildMix: pass on custom nativeBuildInputs 3bc80f19388a8b29b65c91fd4550f51cbc9a3a96 changed buildInputs to nativeBuildInputs, but broke specifying custom nativeBuildInputs. --- pkgs/development/beam-modules/build-mix.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 783ae34dcd38..728d249c97d8 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -4,6 +4,7 @@ , version , src , buildInputs ? [ ] +, nativeBuildInputs ? [ ] , beamDeps ? [ ] , propagatedBuildInputs ? [ ] , postPatch ? "" @@ -23,7 +24,7 @@ let pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; - inherit version src buildInputs; + inherit version src; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -37,7 +38,8 @@ let addToSearchPath ERL_LIBS "$1/lib/erlang/lib" ''; - nativeBuildInputs = [ elixir hex ]; + buildInputs = buildInputs ++ [ ]; + nativeBuildInputs = nativeBuildInputs ++ [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; buildPhase = attrs.buildPhase or ''