Skip to content

Commit bb6f2ac

Browse files
committed
Fix wine
1 parent 12c3845 commit bb6f2ac

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

overlays/wine.nix

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# fix wine at 5.4; later versions build with ucrt and this can break TH code (for instance accessing
2-
# files from TH code) for GHC built with msvcrt (ghc<9.6).
3-
# This will inevitably replace *any* wine version. Thus this might not really be what we ultimately want.
4-
# Wine 5.4 does not build on macOS so that is not pinned and TH code will probably break.
5-
_final: prev: {
1+
final: prev: {
62
winePackages = prev.winePackages // {
73
minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
8-
patches = oldAttrs.patches or [] ++ [ ./patches/wine-add-dll-directory.patch ];
4+
# Fix issue with UNC file paths
5+
patches = oldAttrs.patches or []
6+
++ final.lib.optional (builtins.compareVersions prev.winePackages.minimal.version "10.0" < 0) ./patches/wine-add-dll-directory.patch;
7+
# Avoid dependency on X11
98
configureFlags = oldAttrs.configureFlags or [] ++ [ "--without-x" ];
109
});
1110
};

0 commit comments

Comments
 (0)