Commit 2f293e1f authored by hideyosh1's avatar hideyosh1
Browse files

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.
parent 3171f5a7

pkgs/applications/emulators/wine/packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -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";

pkgs/by-name/cl/cloudflared/tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ in 
      }

      ''

        export HOME="$(mktemp -d)"

        wine64 $exe help

        wine $exe help

        mkdir $out

      '';

}

pkgs/by-name/dx/dxvk/setup_dxvk.sh

+1 −1
Original line number Diff line number Diff line
@@ -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).

pkgs/by-name/vt/vtfedit/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/wi/winbox3/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  version = "3.43";



  src = fetchurl (

    if (wine.meta.mainProgram == "wine64") then

    if (builtins.elem "i686-linux" wine.meta.platforms) then

      {

        url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox64.exe";

        hash = "sha256-W0HPUf2B6NCCaH9rUiFZz0q6IubfjtxIZyHU4JUHtuk=";

        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}/winbox.exe";

        hash = "sha256-pAOOTgmjQoXI2o2MKTDuOOpb7q0rb/zWATDNyAMOLms=";

        url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/winbox64.exe";

        hash = "sha256-W0HPUf2B6NCCaH9rUiFZz0q6IubfjtxIZyHU4JUHtuk=";

      }

  );