git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
19.09 compat (#403)

* fix SETUP being build properly by the build stdenv (nixpkgs#56555 made NIX_DONT_SET_RPATH less restrictive; which showed up in 19.09). * 19.09 fixes * Update wine.nix

commite68599bec9a14c7745918e8dd9f155e37c0c6bad authorMoritz Angermann <moritz.angermann@gmail.com> dateThu 16 Jan 2020, 16:25 (7 years ago) parentcaa7375
4 files changed+23−6
compare with iko/ghcjs-patch-master
unifiedsplit
builder/default.nix+5 config.nix+2−6 overlays/default.nix+1 overlays/wine.nix+15
builder/default.nix+5
@@ -9,6 +9,11 @@ let
99 setup-builder = haskellLib.weakCallPackage pkgs ./setup-builder.nix {
1010 ghc = (ghc.passthru.buildGHC or ghc);
1111 hsPkgs = hsPkgs.buildPackages;
12+ # We need to use the buildPackages stdenv to build the setup-builder.
13+ # in the native case, it would be the same in the corss case however
14+ # re *really* want to build the Setup.hs on the build machine and not
15+ # have the stdenv confuse it with the target/host env.
16+ inherit (buildPackages) stdenv;
1217 inherit buildPackages pkgconfig;
1318 inherit haskellLib nonReinstallablePkgs makeSetupConfigFiles;
1419 };
config.nix+2−6
@@ -2,13 +2,9 @@
22 # allow building for windows
33 allowUnsupportedSystem = true;
44 # we want the 64bit wine version
5+ # See overlays/wine.nix as well!
56 wine.build = "wine64";
6− # once https://github.com/NixOS/nixpkgs/pull/71216 is
7− # merged, we can use `series3`; wine4 seems to suffer
8− # from some non-obvious regression :(
9− # This will also need to be backported to 19.03 and 19.09
10− # at least...
11− wine.release = "series3";
7+ wine.release = "stable";
128
139 # sadly we need to patch GHC a bit.
1410 packageOverrides = ps: with ps; let
overlays/default.nix+1
@@ -3,6 +3,7 @@
33 # This should prevent us inadvertantly depending on them.
44 (_: super: { haskell = {}; haskellPackages = {}; haskell-nix-super = super; })
55 (import ./release-19.03.nix)
6+ (import ./wine.nix)
67 #(import ./ghcjs-asterius-triple.nix)
78 #(import ./python.nix)
89 (import ./haskell.nix)
overlays/wine.nixnew file+15
@@ -0,0 +1,15 @@
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+self: super:
5+{
6+ winePackages = super.winePackages // {
7+ minimal = super.winePackages.minimal.overrideAttrs (oldAttrs: {
8+ name = "wine-3.0.2";
9+ version = "3.0.2";
10+ src = super.fetchurl {
11+ url = "https://dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz";
12+ sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya"; };
13+ });
14+ };
15+}