From 2f293e1fe3ec3dacd14da3d2f95161da4ddcc7b4 Mon Sep 17 00:00:00 2001
From: hideyosh1 <penelope.zhong@proton.me>
Date: Wed, 4 Feb 2026 17:27:11 -0600
Subject: [PATCH] wine: move packages that depend on "wine64" binary to require
 "wine"

according to upstream: "The wine64 loader binary is removed, in favor of
a single wine loader that selects the correct mode based on the binary
being executed. For binaries that have both 32-bit and 64-bit versions
installed, it defaults to 64-bit. The 32-bit version can then be
launched with an explicit path, e.g. wine
c:\\windows\\syswow64\\notepad.exe.",

I have changed all the references to the wine64 binary to only need the
wine binary -- tentative.
---
 pkgs/applications/emulators/wine/packages.nix |  4 ++--
 pkgs/by-name/cl/cloudflared/tests.nix         |  2 +-
 pkgs/by-name/dx/dxvk/setup_dxvk.sh            |  2 +-
 pkgs/by-name/vt/vtfedit/package.nix           |  2 +-
 pkgs/by-name/wi/winbox3/package.nix           | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index db91a073baec..af9082a7d8f9 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -77,7 +77,7 @@ in
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    mainProgram = "wine64";
+    mainProgram = "wine";
   };
   wineWow = callPackage ./base.nix {
     pname = "wine-wow";
@@ -112,7 +112,7 @@ in
       ];
     };
     platforms = [ "x86_64-linux" ];
-    mainProgram = "wine64";
+    mainProgram = "wine";
   };
   wineWow64 = callPackage ./base.nix {
     pname = "wine-wow64";
diff --git a/pkgs/by-name/cl/cloudflared/tests.nix b/pkgs/by-name/cl/cloudflared/tests.nix
index c1c081c0a503..7555af2b1f0d 100644
--- a/pkgs/by-name/cl/cloudflared/tests.nix
+++ b/pkgs/by-name/cl/cloudflared/tests.nix
@@ -56,7 +56,7 @@ in
       }
       ''
         export HOME="$(mktemp -d)"
-        wine64 $exe help
+        wine $exe help
         mkdir $out
       '';
 }
diff --git a/pkgs/by-name/dx/dxvk/setup_dxvk.sh b/pkgs/by-name/dx/dxvk/setup_dxvk.sh
index 529397ab2422..be0388df1425 100644
--- a/pkgs/by-name/dx/dxvk/setup_dxvk.sh
+++ b/pkgs/by-name/dx/dxvk/setup_dxvk.sh
@@ -145,7 +145,7 @@ export WINEDEBUG=-all
 export WINEDLLOVERRIDES="mscoree,mshtml="
 
 wine="wine"
-wine64="wine64"
+wine64="wine"
 wineboot="wineboot"
 
 # $PATH is the way for user to control where wine is located (including custom Wine versions).
diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix
index 43cb881877f0..d89994f0487f 100644
--- a/pkgs/by-name/vt/vtfedit/package.nix
+++ b/pkgs/by-name/vt/vtfedit/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/vtfedit
 
     cp ${icon} $out/share/icons/hicolor/256x256/apps/vtfedit.png
-    cp -r ${if wine.meta.mainProgram == "wine64" then "x64" else "x86"}/* $out/share/lib
+    cp -r ${if builtins.elem "i686-linux" wine.meta.platforms then "x86" else "x64"}/* $out/share/lib
     cp ${./mimetype.xml} $out/share/mime/packages/vtfedit.xml
 
     runHook postInstall
diff --git a/pkgs/by-name/wi/winbox3/package.nix b/pkgs/by-name/wi/winbox3/package.nix
index 21760af2fa77..6f5ed0499fc5 100644
--- a/pkgs/by-name/wi/winbox3/package.nix
+++ b/pkgs/by-name/wi/winbox3/package.nix
@@ -22,16 +22,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   version = "3.43";
 
   src = fetchurl (
-    if (wine.meta.mainProgram == "wine64") then
-      {
-        url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox64.exe";
-        hash = "sha256-W0HPUf2B6NCCaH9rUiFZz0q6IubfjtxIZyHU4JUHtuk=";
-      }
-    else
+    if (builtins.elem "i686-linux" wine.meta.platforms) then
       {
         url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox.exe";
         hash = "sha256-pAOOTgmjQoXI2o2MKTDuOOpb7q0rb/zWATDNyAMOLms=";
       }
+    else
+      {
+        url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox64.exe";
+        hash = "sha256-W0HPUf2B6NCCaH9rUiFZz0q6IubfjtxIZyHU4JUHtuk=";
+      }
   );
 
   dontUnpack = true;