From 7f112e37d16c9cb67ec5fde43d18b377dc78e005 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Wed, 14 Mar 2018 21:00:31 -0700 Subject: [PATCH] wine: correct install order for WoW wine build. Per the wiki at https://wiki.winehq.org/Building_Wine#Shared_WoW64 "if you do choose to install your WoW64 build, you should run make install in the 32-bit build tree first, then in the 64-bit one." This is required, for instance, for the resulting "wineserver" executable to be the 64 bit variant not 32 bit. Which is expected by the binary loader for WoW64. This odd dependency is vaguely mentioned on the packaging wiki page: * https://wiki.winehq.org/Packaging#Binaries --- pkgs/misc/emulators/wine/builder-wow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index cf6cc59a6dac..1aad9fe20c78 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -26,7 +26,7 @@ buildPhase # checkPhase eval "$preInstall" -cd $TMP/wine64 && make install cd $TMP/wine-wow && make install +cd $TMP/wine64 && make install eval "$postInstall" fixupPhase