Unverified Commit 010041cc authored by Yt's avatar Yt Committed by GitHub
Browse files

beamPackages.buildMix,buildRebar3: merge args.env with builder env (#503941)

parents d7df9adf 922a9d65

pkgs/development/beam-modules/build-mix.nix

+2 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/development/beam-modules/build-rebar3.nix

+2 −1
Original line number Diff line number Diff line
@@ -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/"