1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/haskell/haskellrunconfiguration.cpp b/src/plugins/haskell/haskellrunconfiguration.cpp
index 45b6e684bc..76d25e557c 100644
--- a/src/plugins/haskell/haskellrunconfiguration.cpp
+++ b/src/plugins/haskell/haskellrunconfiguration.cpp
@@ -4,12 +4,11 @@
 #include "haskellrunconfiguration.h"
 
 #include "haskellconstants.h"
-#include "haskellmanager.h"
 #include "haskellproject.h"
 #include "haskelltr.h"
+#include "haskellsettings.h"
 
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
@@ -35,7 +34,8 @@ HaskellExecutableAspect::HaskellExecutableAspect()
 HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
-    auto envAspect = addAspect<LocalEnvironmentAspect>(target);
+    auto envAspect = addAspect<EnvironmentAspect>();
+    envAspect->setSupportForBuildEnvironment(target);
 
     addAspect<HaskellExecutableAspect>();
     addAspect<ArgumentsAspect>(macroExpander());
@@ -67,8 +67,8 @@ Runnable HaskellRunConfiguration::runnable() const
         args << "--" << arguments;
 
     r.workingDirectory = projectDirectory;
-    r.environment = aspect<LocalEnvironmentAspect>()->environment();
-    r.command = {r.environment.searchInPath(HaskellManager::stackExecutable().toString()), args};
+    r.environment = aspect<EnvironmentAspect>()->environment();
+    r.command = {r.environment.searchInPath(settings().stackPath().path()), args};
     return r;
 }