sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XMake/Packages: Fix qt5base using python instead of python3

This commit is contained in:
Jérôme Leclercq 2022-01-18 06:02:05 +01:00
parent 0af9a96294
commit 025deb9ae1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xmake-repo/packages/q/qt5base/xmake.lua
View File

@ -43,14 +43,14 @@ package("qt5base")
end) end)
on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package) on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package)
-- ensurepip is dropped in recent releases -- ensurepip has been dropped in recent releases
try try
{ {
function () os.vrunv("python", {"-m", "ensurepip"}) end function () os.vrunv("python3", {"-m", "ensurepip"}) end
} }
os.vrunv("python", {"-m", "pip", "install", "-U", "pip"}) os.vrunv("python3", {"-m", "pip", "install", "-U", "pip"})
os.vrunv("python", {"-m", "pip", "install", "aqtinstall"}) os.vrunv("python3", {"-m", "pip", "install", "aqtinstall"})
local installdir = package:installdir() local installdir = package:installdir()
local version = package:version() or semver.new("5.15.2") local version = package:version() or semver.new("5.15.2")
@ -141,7 +141,7 @@ package("qt5base")
end end
end end
os.vrunv("python", {"-m", "aqt", "install-qt", "-O", installdir, host, target, version:shortstr(), arch}) os.vrunv("python3", {"-m", "aqt", "install-qt", "-O", installdir, host, target, version:shortstr(), arch})
-- move files to root -- move files to root
local subdirs = {} local subdirs = {}