M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

switch to Wine unstable 

Fixes
wine: Call from 00006FFFFFF6E1B8 to unimplemented function KERNEL32.dll.CopyFile2, aborting
This commit is contained in:
Sebastien Bourdeauducq 2024-11-15 10:20:25 +08:00
parent b9e1220d28
commit 29981e7feb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -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 ; 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/"* 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" \ -t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \
-p "qt-ifw/packages" \ -p "qt-ifw/packages" \
-c "qt-ifw/config/config.xml" \ -c "qt-ifw/config/config.xml" \
@ -585,7 +585,7 @@
fakeroot fakeroot
p7zip p7zip
msys2.wine-msys2 msys2.wine-msys2
wineWowPackages.stable wineWowPackages.unstable
]; ];
}; };
}; };

4
msys2/default.nix
View File

@ -20,7 +20,7 @@ let
'' ''
export WINEDEBUG=-all export WINEDEBUG=-all
export WINEPATH=Z:${msys2-env}/clang64/bin 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" wine-msys2-build = pkgs.writeShellScriptBin "wine-msys2-build"
'' ''
@ -28,7 +28,7 @@ let
export WINEDEBUG=-all export WINEDEBUG=-all
export WINEPATH=Z:${msys2-env}/clang64/bin export WINEPATH=Z:${msys2-env}/clang64/bin
${silenceFontconfig} ${silenceFontconfig}
exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@ exec ${pkgs.wineWowPackages.unstable}/bin/wine64 $@
''; '';
in { in {
inherit wine-msys2; inherit wine-msys2;