From 698bb1d4f789e5a8473f80afffae65dd2e201c49 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 6 Sep 2024 19:01:24 +0200 Subject: [PATCH] overrides: fix gitpython --- overrides/build-systems.json | 3 ++- overrides/default.nix | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 1ae7eb543..700ea3d3f 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -8036,7 +8036,8 @@ } ], "gitpython": [ - "setuptools" + "setuptools", + "typing-extensions" ], "glad": [ "setuptools" diff --git a/overrides/default.nix b/overrides/default.nix index 4d057f4a9..280c13811 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1009,11 +1009,12 @@ lib.composeManyExtensions [ } )); - gitpython = prev.gitpython.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs or [ ] ++ [ final.typing-extensions ]; - } - ); + gitpython = prev.gitpython.overridePythonAttrs { + postPatch = '' + substituteInPlace git/cmd.py \ + --replace 'git_exec_name = "git"' 'git_exec_name = "${pkgs.gitMinimal}/bin/git"' + ''; + }; grpcio = prev.grpcio.overridePythonAttrs (old: { nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ];