Skip to content

Commit

Permalink
Repin wine to 3.21 as file access from TH breaks otherwise (#1508)
Browse files Browse the repository at this point in the history
Fixes #1487
  • Loading branch information
hamishmack committed Jun 7, 2022
1 parent 4004e57 commit d71e854
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

let
overlays = {
wine = import ./wine.nix;
#ghcjs = import ./ghcjs-asterius-triple.nix;
#python = import ./python.nix;
haskell = import ./haskell.nix args;
Expand Down Expand Up @@ -38,6 +39,7 @@ let
haskellPackages = { };
haskell-nix-prev = prev;
})
wine
haskell
hackage-quirks
bootstrap
Expand Down
16 changes: 16 additions & 0 deletions overlays/wine.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# fix wine at 3.0.2; the 4.x branch breaks windows cross compilation.
# this will inevitably replace *any* wine version. Thus this might not
# really be what we ultimately want.
final: prev:
{
winePackages = prev.winePackages // {
minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
name = "wine-3.21";
version = "3.21";
src = prev.fetchurl {
url = "https://dl.winehq.org/wine/source/3.x/wine-3.21.tar.xz";
sha256 = "1h70wb7kysbzv36i3fblyiihvalwhy6sj4s2a8nf21nz2mhc0k58"; };
patches = [];
});
};
}

0 comments on commit d71e854

Please sign in to comment.