Merge pull request #199888 from Mic92/mingw-emulator

cross/mingw: fix emulator for mingw32

authored by Jörg Thalheim and committed by GitHub f59a0fa1 15772081

+2 -3
+2 -3
lib/systems/default.nix
··· 183 183 seccompSupport = false; 184 184 hostCpuTargets = [ "${final.qemuArch}-linux-user" ]; 185 185 }; 186 - wine-name = "wine${toString final.parsed.cpu.bits}"; 187 - wine = (pkgs.winePackagesFor wine-name).minimal; 186 + wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; 188 187 in 189 188 if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && 190 189 pkgs.stdenv.hostPlatform.canExecute final 191 190 then "${pkgs.runtimeShell} -c '\"$@\"' --" 192 191 else if final.isWindows 193 - then "${wine}/bin/${wine-name}" 192 + then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}" 194 193 else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux 195 194 then "${qemu-user}/bin/qemu-${final.qemuArch}" 196 195 else if final.isWasi