From 92f45c5d8879583ef3d83922a643ef9b536e3c83 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 11 Dec 2025 04:56:46 +0800
Subject: [PATCH] fetchFromGitHub: simplify useFetchGit and
 useFetchGitArgsWDPassing

---
 pkgs/build-support/fetchgithub/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 7f6cb26e9387..a08f6d5de12b 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -60,16 +60,16 @@ decorate (
   );
 
   let
-    useFetchGit = useFetchGitArgsWDNonNull != useFetchGitargsDefaultNonNull;
+    useFetchGit =
+      lib.mapAttrs (
+        name: nonNullDefault:
+        if args ? ${name} && (useFetchGitArgsDefaultNullable ? ${name} -> args.${name} != null) then
+          args.${name}
+        else
+          nonNullDefault
+      ) useFetchGitargsDefaultNonNull != useFetchGitargsDefaultNonNull;
 
-    useFetchGitArgs = lib.intersectAttrs useFetchGitArgsDefault args;
-    useFetchGitArgsWD = useFetchGitArgsDefault // useFetchGitArgs;
-    useFetchGitArgsWDPassing = removeAttrs useFetchGitArgsWD excludeUseFetchGitArgNames;
-    useFetchGitArgsWDNonNull =
-      useFetchGitArgsWD
-      // lib.mapAttrs (
-        name: nonNullDefault: lib.defaultTo nonNullDefault useFetchGitArgsWD.${name}
-      ) useFetchGitArgsDefaultNullable;
+    useFetchGitArgsWDPassing = lib.overrideExisting (removeAttrs useFetchGitArgsDefault excludeUseFetchGitArgNames) args;
 
     position = (
       if args.meta.description or null != null then