File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -496,17 +496,17 @@ let
496
496
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/12935
497
497
( if contentAddressed then ''
498
498
runHook preBuild
499
- $SETUP_HS build ${ haskellLib . componentTarget componentId } -j1 ${ lib . concatStringsSep " " setupBuildFlags }
499
+ $SETUP_HS build ${ haskellLib . componentTarget componentId } -j1 ${ lib . concatStringsSep " " ( component . setupBuildFlags ++ setupBuildFlags ) }
500
500
runHook postBuild
501
501
'' else if stdenv . hostPlatform . isGhcjs then ''
502
502
runHook preBuild
503
503
# https://gitlab.haskell.org/ghc/ghc/issues/9221
504
- $SETUP_HS build ${ haskellLib . componentTarget componentId } ${ lib . concatStringsSep " " setupBuildFlags }
504
+ $SETUP_HS build ${ haskellLib . componentTarget componentId } ${ lib . concatStringsSep " " ( component . setupBuildFlags ++ setupBuildFlags ) }
505
505
runHook postBuild
506
506
'' else ''
507
507
runHook preBuild
508
508
# https://gitlab.haskell.org/ghc/ghc/issues/9221
509
- $SETUP_HS build ${ haskellLib . componentTarget componentId } -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${ lib . concatStringsSep " " setupBuildFlags }
509
+ $SETUP_HS build ${ haskellLib . componentTarget componentId } -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${ lib . concatStringsSep " " ( component . setupBuildFlags ++ setupBuildFlags ) }
510
510
runHook postBuild
511
511
'' ) ;
512
512
You can’t perform that action at this time.
0 commit comments