From e7fc94e13079fa5678d6c557bb81dbaab05305b7 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:40:24 +0800
Subject: [PATCH] gendepends now supports pkgs2 (#22277)

(cherry picked from commit 3b377937dec9dd6e7a68e9c95c4ec47d6d21d689)
---
 compiler/depends.nim | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/compiler/depends.nim b/compiler/depends.nim
index 1dcdec9891..796880fd61 100644
--- a/compiler/depends.nim
+++ b/compiler/depends.nim
@@ -58,12 +58,16 @@ proc toNimblePath(s: string, isStdlib: bool): string =
       sub.add "/pkgs/"
     var start = s.find(sub)
     if start < 0:
-      result = s
-    else:
-      start += sub.len
-      start += skipUntil(s, '/', start)
-      start += 1
-      result = pkgPrefix & s[start..^1]
+      sub[^1] = '2'
+      sub.add '/'
+      start = s.find(sub) # /pkgs2
+      if start < 0:
+        return s
+
+    start += sub.len
+    start += skipUntil(s, '/', start)
+    start += 1
+    result = pkgPrefix & s[start..^1]
 
 proc addDependency(c: PPassContext, g: PGen, b: Backend, n: PNode) =
   doAssert n.kind == nkSym, $n.kind