Commit fe0481e7 authored by Kacper Koniuszy's avatar Kacper Koniuszy
Browse files

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.
parent d69bd1a7

pkgs/applications/emulators/wine/staging.nix

+2 −2
Original line number Diff line number Diff line 
{ 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