git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Don't duplicate the configureFlags when not on Windows (#1420)
0c9142aThomas Winant
overlays/windows.nix+4−4
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -16,12 +16,12 @@ final: prev:
16 # postFixup = "";
16 # postFixup = "";
17 # });
17 # });
18} // prev.lib.optionalAttrs (prev ? mfpr) {
18} // prev.lib.optionalAttrs (prev ? mfpr) {
19− mfpr = prev.mfpr.overrideAttrs (drv: {
19+ mfpr = if !prev.stdenv.hostPlatform.isWindows then prev.mpfr else prev.mfpr.overrideAttrs (drv: {
20− configureFlags = (drv.configureFlags or []) ++ prev.lib.optional prev.stdenv.hostPlatform.isWindows "--enable-static --disable-shared" ;
20+ configureFlags = (drv.configureFlags or []) ++ [ "--enable-static --disable-shared" ];
21 });
21 });
22} // {
22} // {
23− libmpc = prev.libmpc.overrideAttrs (drv: {
23+ libmpc = if !prev.stdenv.hostPlatform.isWindows then prev.libmpc else prev.libmpc.overrideAttrs (drv: {
24− configureFlags = (drv.configureFlags or []) ++ prev.lib.optional prev.stdenv.hostPlatform.isWindows "--enable-static --disable-shared" ;
24+ configureFlags = (drv.configureFlags or []) ++ [ "--enable-static --disable-shared" ];
25 });
25 });
26
26
27 binutils-unwrapped = prev.binutils-unwrapped.overrideAttrs (attrs: {
27 binutils-unwrapped = prev.binutils-unwrapped.overrideAttrs (attrs: {