qmake2cmake: 1.0.3 -> 1.0.5
This commit is contained in:
parent
90a8b9e3fe
commit
198205160d
|
@ -2,6 +2,7 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchgit
|
, fetchgit
|
||||||
, packaging
|
, packaging
|
||||||
|
, platformdirs
|
||||||
, portalocker
|
, portalocker
|
||||||
, pyparsing
|
, pyparsing
|
||||||
, sympy
|
, sympy
|
||||||
|
@ -10,12 +11,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "qmake2cmake";
|
pname = "qmake2cmake";
|
||||||
version = "1.0.3";
|
version = "1.0.5";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://codereview.qt-project.org/qt/qmake2cmake";
|
url = "https://codereview.qt-project.org/qt/qmake2cmake";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-HzbygFmnKq3E2eEdWCFa4z9Qszfck7dJm2Z5s+il4I0=";
|
hash = "sha256-6a1CIzHj9kmNgWN6QPNNUbiugkyfSrrIb7Fbz0ocr6o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -24,6 +25,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
packaging
|
packaging
|
||||||
|
platformdirs
|
||||||
portalocker
|
portalocker
|
||||||
pyparsing
|
pyparsing
|
||||||
sympy
|
sympy
|
||||||
|
@ -33,6 +35,10 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
export HOME=$(mktemp -d)
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tool to convert qmake .pro files to CMakeLists.txt";
|
description = "Tool to convert qmake .pro files to CMakeLists.txt";
|
||||||
homepage = "https://wiki.qt.io/Qmake2cmake";
|
homepage = "https://wiki.qt.io/Qmake2cmake";
|
||||||
|
|
|
@ -1,17 +1,3 @@
|
||||||
diff --git a/src/qmake2cmake/condition_simplifier_cache.py b/src/qmake2cmake/condition_simplifier_cache.py
|
|
||||||
index 86c8e83..9d1ac00 100755
|
|
||||||
--- a/src/qmake2cmake/condition_simplifier_cache.py
|
|
||||||
+++ b/src/qmake2cmake/condition_simplifier_cache.py
|
|
||||||
@@ -29,8 +29,7 @@ def get_current_file_path() -> str:
|
|
||||||
|
|
||||||
|
|
||||||
def get_cache_location() -> str:
|
|
||||||
- this_file = get_current_file_path()
|
|
||||||
- dir_path = os.path.dirname(this_file)
|
|
||||||
+ dir_path = os.getcwd()
|
|
||||||
cache_path = os.path.join(dir_path, ".pro2cmake_cache", "cache.json")
|
|
||||||
return cache_path
|
|
||||||
|
|
||||||
diff --git a/src/qmake2cmake/run_pro2cmake.py b/src/qmake2cmake/run_pro2cmake.py
|
diff --git a/src/qmake2cmake/run_pro2cmake.py b/src/qmake2cmake/run_pro2cmake.py
|
||||||
index fd3e11a..bdbadb0 100755
|
index fd3e11a..bdbadb0 100755
|
||||||
--- a/src/qmake2cmake/run_pro2cmake.py
|
--- a/src/qmake2cmake/run_pro2cmake.py
|
||||||
|
|
Loading…
Reference in a new issue