From b296e3ec29abbae57a8bd06617b80836364874be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Feb 2026 19:04:40 +0100 Subject: [PATCH] git: avoid rebuilds on non-Darwin for now --- pkgs/by-name/gi/git/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix index 49be29b17628..0706590fe968 100644 --- a/pkgs/by-name/gi/git/package.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -130,6 +130,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw"; hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU="; }) + ] + ++ lib.optionals osxkeychainSupport [ # Fix build failure on Darwin when building Keychain integration # See https://github.com/git/git/pull/2188 and https://github.com/Homebrew/homebrew-core/pull/266961 (fetchurl { @@ -138,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7jTiMM5XFRDj/srtVf8olW62T/mesqLcyRp3NZJcid8="; }) ] - ++ lib.optionals rustSupport [ + ++ lib.optionals (rustSupport && osxkeychainSupport) [ # The above patch doesn’t work with Rust support enabled. ./osxkeychain-link-rust_lib.patch ]