Skip to content

Commit 62f3a29

Browse files
committed
allow setupBuildFlags on components and packages
1 parent 0b6766f commit 62f3a29

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builder/comp-builder.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,17 +454,17 @@ let
454454
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/12935
455455
(if contentAddressed then ''
456456
runHook preBuild
457-
$SETUP_HS build ${haskellLib.componentTarget componentId} -j1 ${lib.concatStringsSep " " setupBuildFlags}
457+
$SETUP_HS build ${haskellLib.componentTarget componentId} -j1 ${lib.concatStringsSep " " (component.setupBuildFlags ++ setupBuildFlags)}
458458
runHook postBuild
459459
'' else if stdenv.hostPlatform.isGhcjs then ''
460460
runHook preBuild
461461
# https://gitlab.haskell.org/ghc/ghc/issues/9221
462-
$SETUP_HS build ${haskellLib.componentTarget componentId} ${lib.concatStringsSep " " setupBuildFlags}
462+
$SETUP_HS build ${haskellLib.componentTarget componentId} ${lib.concatStringsSep " " (component.setupBuildFlags ++ setupBuildFlags)}
463463
runHook postBuild
464464
'' else ''
465465
runHook preBuild
466466
# https://gitlab.haskell.org/ghc/ghc/issues/9221
467-
$SETUP_HS build ${haskellLib.componentTarget componentId} -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${lib.concatStringsSep " " setupBuildFlags}
467+
$SETUP_HS build ${haskellLib.componentTarget componentId} -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${lib.concatStringsSep " " (component.setupBuildFlags ++ setupBuildFlags)}
468468
runHook postBuild
469469
'');
470470

0 commit comments

Comments
 (0)