From f56cb5507bbed8e39c7c18d70b579298c0eb5ce6 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 22 Mar 2026 00:40:51 +0100
Subject: [PATCH 1/2] buildMavenPackage: do not clobber env

---
 pkgs/by-name/ma/maven/build-maven-package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 0738126f66ed..65b8bd2f7fc6 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -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

From fb059853b25057c037ff41e9f15b1eef660b0f91 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 22 Mar 2026 00:31:59 +0100
Subject: [PATCH 2/2] cryptomator: move SOURCE_DATE_EPOCH into env for
 structuredAttrs

---
 pkgs/by-name/cr/cryptomator/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index e374518ca5cc..223b1e83adb1 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -35,12 +35,11 @@ maven.buildMavenPackage rec {
   mvnParameters = "-Dmaven.test.skip=true -Plinux";
   mvnHash = "sha256-IVOcDFW5YKgUHJKX3ZXYVnOevwmOwN5yEU8jfPtCY1I=";
   mvnFetchExtraArgs.env = {
-    inherit SOURCE_DATE_EPOCH;
+    inherit (env) SOURCE_DATE_EPOCH;
   };
 
   # fix for "date 1980-01-01T00:00:00Z is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z"
-  # this should be in env, but looks like buildMavenPackage doesn't support that
-  SOURCE_DATE_EPOCH = 315532802; # 1980-01-01T00:00:02Z
+  env.SOURCE_DATE_EPOCH = 315532802; # 1980-01-01T00:00:02Z
 
   preBuild = ''
     VERSION=${version}