From 922a9d65f440d91557501992745759cf34278109 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 26 Mar 2026 23:36:26 -0400 Subject: [PATCH] beamPackages.buildMix,buildRebar3: merge args.env with builder env --- pkgs/development/beam-modules/build-mix.nix | 3 ++- pkgs/development/beam-modules/build-rebar3.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 52c0ce1ad1f8e..1994f89f3ef12 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -57,7 +57,8 @@ lib.extendMkDerivation { # some hooks need name-version, but we've overridden name above for the nix package beamModuleName = args.name; - }; + } + // (args.env or { }); __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 11b1c8b44e528..1145905996bc0 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -67,7 +67,8 @@ lib.extendMkDerivation { "[${lib.concatStringsSep "," options}]"; beamModuleName = args.name; - }; + } + // (args.env or { }); setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"