From e48590229ed1d1e97e24d9a77287567b739a8af2 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 7 Jun 2022 16:02:20 +1200 Subject: [PATCH] Repin wine to 3.21 as file access from TH breaks otherwise Fixes #1487 --- overlays/default.nix | 2 ++ overlays/wine.nix | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 overlays/wine.nix diff --git a/overlays/default.nix b/overlays/default.nix index 6238aca7f8..92157724b3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -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; @@ -38,6 +39,7 @@ let haskellPackages = { }; haskell-nix-prev = prev; }) + wine haskell hackage-quirks bootstrap diff --git a/overlays/wine.nix b/overlays/wine.nix new file mode 100644 index 0000000000..57a1d9a6c3 --- /dev/null +++ b/overlays/wine.nix @@ -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 = []; + }); + }; +}