Skip to content

Commit d71e854

Browse files
authored
Repin wine to 3.21 as file access from TH breaks otherwise (#1508)
Fixes #1487
1 parent 4004e57 commit d71e854

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

Diff for: overlays/default.nix

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
let
44
overlays = {
5+
wine = import ./wine.nix;
56
#ghcjs = import ./ghcjs-asterius-triple.nix;
67
#python = import ./python.nix;
78
haskell = import ./haskell.nix args;
@@ -38,6 +39,7 @@ let
3839
haskellPackages = { };
3940
haskell-nix-prev = prev;
4041
})
42+
wine
4143
haskell
4244
hackage-quirks
4345
bootstrap

Diff for: overlays/wine.nix

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# fix wine at 3.0.2; the 4.x branch breaks windows cross compilation.
2+
# this will inevitably replace *any* wine version. Thus this might not
3+
# really be what we ultimately want.
4+
final: prev:
5+
{
6+
winePackages = prev.winePackages // {
7+
minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
8+
name = "wine-3.21";
9+
version = "3.21";
10+
src = prev.fetchurl {
11+
url = "https://dl.winehq.org/wine/source/3.x/wine-3.21.tar.xz";
12+
sha256 = "1h70wb7kysbzv36i3fblyiihvalwhy6sj4s2a8nf21nz2mhc0k58"; };
13+
patches = [];
14+
});
15+
};
16+
}

0 commit comments

Comments
 (0)