Skip to content

Commit 74cb0fc

Browse files
Revert "Don't duplicate the configureFlags when not on Windows (input-output-hk#1420)"
This reverts commit 0c9142a.
1 parent cc40a24 commit 74cb0fc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

overlays/windows.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ final: prev:
1616
# postFixup = "";
1717
# });
1818
} // prev.lib.optionalAttrs (prev ? mfpr) {
19-
mfpr = if !prev.stdenv.hostPlatform.isWindows then prev.mpfr else prev.mfpr.overrideAttrs (drv: {
20-
configureFlags = (drv.configureFlags or []) ++ [ "--enable-static --disable-shared" ];
19+
mfpr = prev.mfpr.overrideAttrs (drv: {
20+
configureFlags = (drv.configureFlags or []) ++ prev.lib.optional prev.stdenv.hostPlatform.isWindows "--enable-static --disable-shared" ;
2121
});
2222
} // {
23-
libmpc = if !prev.stdenv.hostPlatform.isWindows then prev.libmpc else prev.libmpc.overrideAttrs (drv: {
24-
configureFlags = (drv.configureFlags or []) ++ [ "--enable-static --disable-shared" ];
23+
libmpc = prev.libmpc.overrideAttrs (drv: {
24+
configureFlags = (drv.configureFlags or []) ++ prev.lib.optional prev.stdenv.hostPlatform.isWindows "--enable-static --disable-shared" ;
2525
});
2626

2727
binutils-unwrapped = prev.binutils-unwrapped.overrideAttrs (attrs: {

0 commit comments

Comments
 (0)