push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,51 @@
{
lib,
buildPythonPackage,
fetchgit,
packaging,
platformdirs,
portalocker,
pyparsing,
setuptools,
sympy,
pytestCheckHook,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
pname = "qmake2cmake";
version = "1.0.7";
pyproject = true;
src = fetchgit {
url = "https://codereview.qt-project.org/qt/qmake2cmake";
tag = "v${version}";
hash = "sha256-Y1HU4bNZY0b1C8HIX43AR24zoIyTEgkVXpnweEBlOYk=";
};
patches = [
./fix-locations.patch
];
build-system = [ setuptools ];
dependencies = [
packaging
platformdirs
portalocker
pyparsing
sympy
];
nativeCheckInputs = [
pytestCheckHook
writableTmpDirAsHomeHook
];
meta = {
description = "Tool to convert qmake .pro files to CMakeLists.txt";
homepage = "https://wiki.qt.io/Qmake2cmake";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ wegank ];
};
}

View File

@@ -0,0 +1,22 @@
diff --git a/src/qmake2cmake/run_pro2cmake.py b/src/qmake2cmake/run_pro2cmake.py
index fd3e11a..bdbadb0 100755
--- a/src/qmake2cmake/run_pro2cmake.py
+++ b/src/qmake2cmake/run_pro2cmake.py
@@ -194,7 +194,6 @@ def run(all_files: typing.List[str], pro2cmake: str, args: argparse.Namespace) -
) -> typing.Tuple[int, str, str]:
filename, index, total = data
pro2cmake_args = []
- pro2cmake_args.append(sys.executable)
pro2cmake_args.append(pro2cmake)
if args.min_qt_version:
pro2cmake_args += ["--min-qt-version", args.min_qt_version]
@@ -257,8 +256,7 @@ def run(all_files: typing.List[str], pro2cmake: str, args: argparse.Namespace) -
def main() -> None:
args = parse_command_line()
- script_path = os.path.dirname(os.path.abspath(__file__))
- pro2cmake = os.path.join(script_path, "pro2cmake.py")
+ pro2cmake = os.path.join(os.path.dirname(sys.argv[0]), "qmake2cmake")
base_path = args.path
all_files = find_all_pro_files(base_path, args)