Honor build-tool-depends in CmdRun

Similarly to CmdExec and CmdTest, get paths to all dependency binaries
and add those to PATH. Unlike CmdExec, add just the explicitly required
paths.

(cherry picked from commit f06195d3)

# Conflicts:
#	cabal-install/src/Distribution/Client/CmdExec.hs

cabal-install/src/Distribution/Client/CmdExec.hs

@@ -268,6 +268,7 @@ withTempEnvFile verbosity baseCtx buildCtx buildStatus action = do
        buildStatus
      action envOverrides)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 pathAdditions :: Verbosity -> ProjectBaseContext -> ProjectBuildContext -> IO [FilePath]
 pathAdditions verbosity ProjectBaseContext{..}ProjectBuildContext{..} = do
@@ -278,6 +279,9 @@ pathAdditions verbosity ProjectBaseContext{..}ProjectBuildContext{..} = do
   paths = S.toList
         $ binDirectories distDirLayout elaboratedShared elaboratedPlanToExecute
 =======
+=======
+-- | Get paths to all dependency executables to be included in PATH.
+>>>>>>> f06195d3a (Honor build-tool-depends in CmdRun)
 pathAdditions :: ProjectBaseContext -> ProjectBuildContext -> [FilePath]
 pathAdditions ProjectBaseContext{..} ProjectBuildContext{..} =
   paths ++ cabalConfigPaths
@@ -292,6 +296,7 @@ pathAdditions ProjectBaseContext{..} ProjectBuildContext{..} =
         binDirectories distDirLayout elaboratedShared elaboratedPlanToExecute
 >>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
 
+-- | Get paths to all dependency executables to be included in PATH.
 binDirectories
   :: DistDirLayout
   -> ElaboratedSharedConfig

cabal-install/src/Distribution/Client/CmdRun.hs

@@ -107,6 +107,7 @@ import Distribution.Client.ProjectPlanning
   )
 import Distribution.Client.ProjectPlanning.Types
   ( dataDirsEnvironmentForPlan
+  , elabExeDependencyPaths
   )
 import Distribution.Client.ScriptUtils
   ( AcceptNoTargets (..)
@@ -335,11 +336,13 @@ runAction flags@NixStyleFlags {..} targetAndArgs globalFlags
               || buildSettingOnlyDownload (buildSettings baseCtx)
 
     let extraPath =
-          fromNubList
-            . projectConfigProgPathExtra
-            . projectConfigShared
-            . projectConfig
-            $ baseCtx
+          elabExeDependencyPaths pkg
+            ++ ( fromNubList
+                  . projectConfigProgPathExtra
+                  . projectConfigShared
+                  . projectConfig
+                  $ baseCtx
+               )
 
     logExtraProgramSearchPath verbosity extraPath
 

changelog.d/pr-9341

+synopsis: Fix run command environment
+packages: cabal-install
+prs: #9341
+issues: #8391
+
+description: {
+
+- The Run command will now add binary paths of dependencies
+  (build-tool-depends) to PATH, just like Exec and Test commands.
+
+}
\ No newline at end of file