From 7a6c099c08378b0c5eb501bef2dcb140ae6d7b7d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 5 Jul 2021 16:17:53 +0200
Subject: [PATCH] Nim: Use remote device when searching compilers there

Change-Id: Iab1cb1dbaaf789d2ad328ab70c3dec8839d4ffcc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/nim/project/nimtoolchainfactory.cpp        | 7 ++++---
 tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp
index c7ff4500f5d..1d11d1bd873 100644
--- a/src/plugins/nim/project/nimtoolchainfactory.cpp
+++ b/src/plugins/nim/project/nimtoolchainfactory.cpp
@@ -28,6 +28,8 @@
 #include "nimconstants.h"
 #include "nimtoolchain.h"
 
+#include <projectexplorer/devicesupport/devicemanager.h>
+
 #include <utils/algorithm.h>
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
@@ -52,11 +54,10 @@ NimToolChainFactory::NimToolChainFactory()
 QList<ToolChain *> NimToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown,
                                                    const IDevice::Ptr &device)
 {
-    Q_UNUSED(device);
     QList<ToolChain *> result;
 
-    Environment systemEnvironment = Environment::systemEnvironment();
-    const FilePath compilerPath = systemEnvironment.searchInPath("nim");
+    IDevice::ConstPtr dev = device ? device : DeviceManager::defaultDesktopDevice();
+    const FilePath compilerPath = dev->searchInPath(FilePath::fromString("nim"));
     if (compilerPath.isEmpty())
         return result;
 
diff --git a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
index f0d9b9de363..473d3256fc3 100644
--- a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
+++ b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
@@ -18,5 +18,6 @@ RUN apt-get update \
     g++ \
     gdb \
     ninja-build \
+    nim \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*