on iko/ghcjs-patch-master help sign in
Merge #471
e6af103iohk-bors[bot]
overlays/mingw_w64.nix+12−1
@@ -50,7 +50,18 @@ let
50 wineTestWrapper = writeScriptBin "test-wrapper" ''
50 wineTestWrapper = writeScriptBin "test-wrapper" ''
51 #!${stdenv.shell}
51 #!${stdenv.shell}
52 set -euo pipefail
52 set -euo pipefail
53+ export WINEDLLOVERRIDES="winemac.drv=d"
53− WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag LC_ALL=en_US.UTF-8 WINEPREFIX=$TMP ${wine}/bin/wine64 $@
54+ export WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag
55+ export LC_ALL=en_US.UTF-8
56+ export WINEPREFIX=$TMP
57+ Path="''${Path:-}"
58+ for path in ''${nativeBuildInputs:-}; do
59+ if [ -d "$path/bin" ]; then
60+ Path="$Path;$(${wine}/bin/winepath -w $path/bin)";
61+ fi
62+ done
63+ export Path
64+ ${wine}/bin/wine64 $@
54 '';
65 '';
55 testWrapper = lib.optional hostPlatform.isWindows "${wineTestWrapper}/bin/test-wrapper";
66 testWrapper = lib.optional hostPlatform.isWindows "${wineTestWrapper}/bin/test-wrapper";
56
67