Unverified Commit f56cb550 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

buildMavenPackage: do not clobber env

parent 1724d223

pkgs/by-name/ma/maven/build-maven-package.nix

+7 −3
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ let 
      ]

      ++ args.nativeBuildInputs or [ ];



      env.JAVA_HOME = mvnJdk;

      env = mvnFetchExtraArgs.env or { } // {

        JAVA_HOME = mvnJdk;

      };



      impureEnvVars = lib.fetchers.proxyImpureEnvVars;
@@ -119,7 +121,7 @@ let 
      outputHashMode = "recursive";

      outputHash = mvnHash;

    }

    // mvnFetchExtraArgs

    // (removeAttrs mvnFetchExtraArgs [ "env" ])

  );

in

stdenv.mkDerivation (
@@ -131,7 +133,9 @@ stdenv.mkDerivation ( 
      maven

    ];



    env.JAVA_HOME = mvnJdk;

    env = args.env or { } // {

      JAVA_HOME = mvnJdk;

    };



    buildPhase = ''

      runHook preBuild