From 87f4f101d773a53c8639d7127ab2f9ee6371ef98 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Sun, 6 Nov 2022 20:10:25 +0100
Subject: cross/mingw: fix emulator for mingw32

---
 lib/systems/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib/systems/default.nix')

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 233174d40831c..4af3d612f81bd 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -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
-- 
cgit 1.4.1