Skip to content

Commit 567a347

Browse files
committed
Simplify mingw_w64.nix
1 parent fe3584d commit 567a347

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

overlays/mingw_w64.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}:
1414
let
1515

16-
configureFlags = lib.optional hostPlatform.isWindows "--disable-split-sections";
16+
configureFlags = ["--disable-split-sections"];
1717

1818
wineIservWrapperScript = enableProfiling:
1919
let
@@ -73,14 +73,14 @@ let
7373
################################################################################
7474
# Build logic (TH support via remote iserv via wine)
7575
#
76-
ghcOptions = lib.optionals hostPlatform.isWindows ([
76+
ghcOptions = [
7777
"-fexternal-interpreter"
7878
"-pgmi" "${wineIservWrapper}/bin/iserv-wrapper"
7979
# TODO: this should be automatically injected based on the extraLibrary.
8080
"-L${mingw_w64_pthreads}/lib"
8181
"-L${mingw_w64_pthreads}/bin"
8282
"-L${gmp}/lib"
83-
]);
83+
];
8484

8585
################################################################################
8686
# Test logic via wine
@@ -103,6 +103,6 @@ let
103103
export Path
104104
${wine}/bin/wine64 $@
105105
'';
106-
testWrapper = lib.optional hostPlatform.isWindows "${wineTestWrapper}/bin/test-wrapper";
106+
testWrapper = ["${wineTestWrapper}/bin/test-wrapper"];
107107

108108
in { inherit testWrapper ghcOptions configureFlags; }

0 commit comments

Comments
 (0)