From 198205160db3e3984a2257c7af5ff1ed12b5a46c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 25 Apr 2023 00:14:24 +0300
Subject: [PATCH] qmake2cmake: 1.0.3 -> 1.0.5

---
 pkgs/tools/misc/qmake2cmake/default.nix         | 10 ++++++++--
 pkgs/tools/misc/qmake2cmake/fix-locations.patch | 14 --------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/tools/misc/qmake2cmake/default.nix
index 7ed349af31c..ea70325cee8 100644
--- a/pkgs/tools/misc/qmake2cmake/default.nix
+++ b/pkgs/tools/misc/qmake2cmake/default.nix
@@ -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";
diff --git a/pkgs/tools/misc/qmake2cmake/fix-locations.patch b/pkgs/tools/misc/qmake2cmake/fix-locations.patch
index 44741c0e708..33b22382e21 100644
--- a/pkgs/tools/misc/qmake2cmake/fix-locations.patch
+++ b/pkgs/tools/misc/qmake2cmake/fix-locations.patch
@@ -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