wineWow64Packages.stagingFull: fix patch failure

The gitapply.sh script from wine-staging tries to use 'git apply' first.
If git is not present, it will fall back to using the patch command.

As of wine 9.13, at least one of the patches doesn't apply correctly with
'patch', but it works with git. Adding gitMinimal to nativeBuildInputs
fixes the build errors.
This commit is contained in:
Kacper Koniuszy
2024-07-29 19:06:42 +02:00
parent d69bd1a75b
commit fe0481e7d8
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable, gitMinimal }:
with callPackage ./util.nix {};
@@ -9,7 +9,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino
(wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: {
buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs;
nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
nativeBuildInputs = [ autoconf hexdump perl python3 gitMinimal ] ++ self.nativeBuildInputs;
prePatch = self.prePatch or "" + ''
patchShebangs tools