From 29981e7feb8f4608ad4ff4e4680258f960d607b3 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Nov 2024 10:20:25 +0800 Subject: [PATCH] switch to Wine unstable Fixes wine: Call from 00006FFFFFF6E1B8 to unimplemented function KERNEL32.dll.CopyFile2, aborting --- flake.nix | 4 ++-- msys2/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ccbafc2..dd9ada2 100644 --- a/flake.nix +++ b/flake.nix @@ -555,7 +555,7 @@ sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ; 7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_root/"* - ${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \ + ${pkgs.wineWowPackages.unstable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \ -t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \ -p "qt-ifw/packages" \ -c "qt-ifw/config/config.xml" \ @@ -585,7 +585,7 @@ fakeroot p7zip msys2.wine-msys2 - wineWowPackages.stable + wineWowPackages.unstable ]; }; }; diff --git a/msys2/default.nix b/msys2/default.nix index 608c295..9becca9 100644 --- a/msys2/default.nix +++ b/msys2/default.nix @@ -20,7 +20,7 @@ let '' export WINEDEBUG=-all export WINEPATH=Z:${msys2-env}/clang64/bin - exec ${pkgs.wineWowPackages.stable}/bin/wine64 cmd + exec ${pkgs.wineWowPackages.unstable}/bin/wine64 cmd ''; wine-msys2-build = pkgs.writeShellScriptBin "wine-msys2-build" '' @@ -28,7 +28,7 @@ let export WINEDEBUG=-all export WINEPATH=Z:${msys2-env}/clang64/bin ${silenceFontconfig} - exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@ + exec ${pkgs.wineWowPackages.unstable}/bin/wine64 $@ ''; in { inherit wine-msys2;