From fe0481e7d8755d09a257787a898f7c870dd10fa0 Mon Sep 17 00:00:00 2001 From: Kacper Koniuszy <120419423+kkoniuszy@users.noreply.github.com> Date: Mon, 29 Jul 2024 19:06:42 +0200 Subject: [PATCH] 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. --- pkgs/applications/emulators/wine/staging.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index 56525d4fa067..4a9bfb6c3204 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix @@ -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