Unverified Commit f59a0fa1 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #199888 from Mic92/mingw-emulator

cross/mingw: fix emulator for mingw32
parents 15772081 87f4f101
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -183,14 +183,13 @@ rec {
              seccompSupport = false;
              hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
            };
            wine-name = "wine${toString final.parsed.cpu.bits}";
            wine = (pkgs.winePackagesFor wine-name).minimal;
            wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
          in
          if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
            pkgs.stdenv.hostPlatform.canExecute final
          then "${pkgs.runtimeShell} -c '\"$@\"' --"
          else if final.isWindows
          then "${wine}/bin/${wine-name}"
          then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"
          else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
          then "${qemu-user}/bin/qemu-${final.qemuArch}"
          else if final.isWasi