mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
qmake2cmake: 1.0.3 -> 1.0.5
This commit is contained in:
parent
90a8b9e3fe
commit
198205160d
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, packaging
|
||||
, platformdirs
|
||||
, portalocker
|
||||
, pyparsing
|
||||
, sympy
|
||||
@ -10,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qmake2cmake";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codereview.qt-project.org/qt/qmake2cmake";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HzbygFmnKq3E2eEdWCFa4z9Qszfck7dJm2Z5s+il4I0=";
|
||||
hash = "sha256-6a1CIzHj9kmNgWN6QPNNUbiugkyfSrrIb7Fbz0ocr6o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -24,6 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
platformdirs
|
||||
portalocker
|
||||
pyparsing
|
||||
sympy
|
||||
@ -33,6 +35,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to convert qmake .pro files to CMakeLists.txt";
|
||||
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
|
||||
index fd3e11a..bdbadb0 100755
|
||||
--- a/src/qmake2cmake/run_pro2cmake.py
|
||||
|
Loading…
Reference in New Issue
Block a user