Skip to content

Commit 0ca227b

Browse files
committed
allow setupBuildFlags on components and packages
1 parent 939365b commit 0ca227b

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
@@ -496,17 +496,17 @@ let
496496
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/12935
497497
(if contentAddressed then ''
498498
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)}
500500
runHook postBuild
501501
'' else if stdenv.hostPlatform.isGhcjs then ''
502502
runHook preBuild
503503
# 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)}
505505
runHook postBuild
506506
'' else ''
507507
runHook preBuild
508508
# 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)}
510510
runHook postBuild
511511
'');
512512

0 commit comments

Comments
 (0)