Merge pull request #7041 from xmake-io/passdeps

fix passconfs

Author: waruqi

xmake/modules/package/tools/xmake.lua

@@ -445,11 +445,40 @@ function _get_package_depconfs_envs(envs, package, opt)
     local requireconfs = {}
     for _, dep in ipairs(package:librarydeps()) do
         local requireinfo = dep:requireinfo()
-        if requireinfo and (requireinfo.override or (requireinfo.configs and not table.empty(requireinfo.configs))) then
+        -- {
+        --  requirekey = "imgui#8b6c4fbd",
+        --  originstr = "imgui",
+        --  configs = { },
+        --  resolvedinfo = {
+        --    version = "v1.91.1",
+        --    configs = { }
+        --  },
+        --  version = "v1.91.1"
+        --}
+        local passed_requireinfo
+        if requireinfo then
+            local resolvedinfo = requireinfo.resolvedinfo
+            if resolvedinfo then
+                requireinfo = resolvedinfo
+            end
+        end
+        if requireinfo then
+            if requireinfo.version and requireinfo.version ~= "latest" then
+                passed_requireinfo = passed_requireinfo or {}
+                passed_requireinfo.version = requireinfo.version
+                passed_requireinfo.override = true
+            end
+            if requireinfo.configs and not table.empty(requireinfo.configs) then
+                passed_requireinfo = passed_requireinfo or {}
+                passed_requireinfo.configs = requireinfo.configs
+                passed_requireinfo.override = true
+            end
+        end
+        if passed_requireinfo then
             local requirepaths = {}
             _get_package_requirepaths(requirepaths, package, dep, {})
             if #requirepaths > 0 then
-                table.insert(requireconfs, {requirepaths = requirepaths, requireinfo = requireinfo})
+                table.insert(requireconfs, {requirepaths = requirepaths, requireinfo = passed_requireinfo})
             end
         end
     end