Merge pull request #5587 from tkaaad97/stack_ghci_config_flags

FIX #5434: use stack.yaml's package flags in stack ghci

Author: snoyberg

ChangeLog.md

@@ -45,8 +45,10 @@ Bug fixes:
 * `stack setup` will look in sandboxed directories for executables, not
   relying on `findExecutables. See
   [GHC issue 20074](https://gitlab.haskell.org/ghc/ghc/-/issues/20074)
-* Track changes to `setup-config` properly to avoid reconfiguring on every
-  change. See [#5578](https://github.com/commercialhaskell/stack/issues/5578)
+* Track changes to `setup-config` properly to avoid reconfiguring on every change.
+  See [#5578](https://github.com/commercialhaskell/stack/issues/5578)
+* `stack ghci` now uses package flags in `stack.yaml`
+  [#5434](https://github.com/commercialhaskell/stack/issues/5434)
 
 
 ## v2.7.1

src/Stack/Ghci.hs

@@ -644,11 +644,12 @@ loadGhciPkgDesc buildOptsCLI name cabalfp target = do
           (cpCabalConfigOpts . ppCommon <$> M.lookup name smProject)
           <|>
           (cpCabalConfigOpts . dpCommon <$> M.lookup name smDeps)
+        sourceMapFlags = maybe mempty (cpFlags . ppCommon) $ M.lookup name smProject
         config =
             PackageConfig
             { packageConfigEnableTests = True
             , packageConfigEnableBenchmarks = True
-            , packageConfigFlags = getLocalFlags buildOptsCLI name
+            , packageConfigFlags = getLocalFlags buildOptsCLI name `M.union` sourceMapFlags
             , packageConfigGhcOptions = sourceMapGhcOptions
             , packageConfigCabalConfigOpts = sourceMapCabalConfigOpts
             , packageConfigCompilerVersion = compilerVersion