From ddc654e2e7e44617bfc17a5aed2a0947d3e192cc Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 20 Jan 2022 10:47:08 +0000
Subject: [PATCH] combine

---
 builder/comp-builder.nix | 4 ++--
 modules/plan.nix         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builder/comp-builder.nix b/builder/comp-builder.nix
index 3017fccd14..81796c2b66 100644
--- a/builder/comp-builder.nix
+++ b/builder/comp-builder.nix
@@ -385,12 +385,12 @@ let
     buildPhase = if stdenv.hostPlatform.isGhcjs then ''
       runHook preBuild
       # https://gitlab.haskell.org/ghc/ghc/issues/9221
-      $SETUP_HS build ${haskellLib.componentTarget componentId} ${lib.concatStringsSep " " setupBuildFlags}
+      $SETUP_HS build ${haskellLib.componentTarget componentId} ${lib.concatStringsSep " " (component.setupBuildFlags ++ setupBuildFlags)}
       runHook postBuild
     '' else ''
       runHook preBuild
       # https://gitlab.haskell.org/ghc/ghc/issues/9221
-      $SETUP_HS build ${haskellLib.componentTarget componentId} -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${lib.concatStringsSep " " setupBuildFlags}
+      $SETUP_HS build ${haskellLib.componentTarget componentId} -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${lib.concatStringsSep " " (component.setupBuildFlags ++ setupBuildFlags)}
       runHook postBuild
     ''
     ;
diff --git a/modules/plan.nix b/modules/plan.nix
index 2494525b9b..a89a23b512 100644
--- a/modules/plan.nix
+++ b/modules/plan.nix
@@ -245,7 +245,7 @@ let
       default = def.ghcOptions or [];
     };
     planned = mkOption {
-      description = "Set to true by `plan-to-nix` for any component that was included in the `plan.json` file.";  
+      description = "Set to true by `plan-to-nix` for any component that was included in the `plan.json` file.";
       # This is here so that (rather than in componentOptions) so it can be set project wide for stack projects
       type = bool;
       default = def.planned or false;