From 025deb9ae1661258151aee09b7c4dfbcb0c5241c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 18 Jan 2022 06:02:05 +0100 Subject: [PATCH] XMake/Packages: Fix qt5base using python instead of python3 --- xmake-repo/packages/q/qt5base/xmake.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xmake-repo/packages/q/qt5base/xmake.lua b/xmake-repo/packages/q/qt5base/xmake.lua index cadffc681..735f339b1 100644 --- a/xmake-repo/packages/q/qt5base/xmake.lua +++ b/xmake-repo/packages/q/qt5base/xmake.lua @@ -43,14 +43,14 @@ package("qt5base") end) on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package) - -- ensurepip is dropped in recent releases + -- ensurepip has been dropped in recent releases 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("python", {"-m", "pip", "install", "aqtinstall"}) + + os.vrunv("python3", {"-m", "pip", "install", "-U", "pip"}) + os.vrunv("python3", {"-m", "pip", "install", "aqtinstall"}) local installdir = package:installdir() local version = package:version() or semver.new("5.15.2") @@ -141,7 +141,7 @@ package("qt5base") 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 local subdirs = {}