diff --git a/pkgs/applications/gis/qgis/set-pyqt6-package-dirs.patch b/pkgs/applications/gis/qgis/set-pyqt6-package-dirs.patch
deleted file mode 100644
index 8805ac72d3ae..000000000000
--- a/pkgs/applications/gis/qgis/set-pyqt6-package-dirs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/cmake/FindPyQt6.cmake b/cmake/FindPyQt6.cmake
-index a938417a03f..b3a2d3cf091 100644
---- a/cmake/FindPyQt6.cmake
-+++ b/cmake/FindPyQt6.cmake
-@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT6_VERSION_STR)
-   IF(SIP_BUILD_EXECUTABLE)
-     # SIP >= 5.0 path
-
--    FILE(GLOB _pyqt6_metadata "${Python_SITEARCH}/PyQt6-*.dist-info/METADATA")
-+    FILE(GLOB _pyqt6_metadata "@pyQt6PackageDir@/[Pp]y[Qq]t6-*.dist-info/METADATA")
-     IF(_pyqt6_metadata)
-       FILE(READ ${_pyqt6_metadata} _pyqt6_metadata_contents)
-       STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT6_VERSION_STR ${_pyqt6_metadata_contents})
-
-diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake
-index f6a06ebd5b4..ca502d60fbd 100644
---- a/cmake/FindQsci.cmake
-+++ b/cmake/FindQsci.cmake
-@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR)
-   IF(SIP_BUILD_EXECUTABLE)
-     # SIP >= 5.0 path
-
--    FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA")
-+    FILE(GLOB _qsci_metadata "@qsciPackageDir@/[Pp]y[Qq]t6[_-][Qq]scintilla*.dist-info/METADATA")
-     IF(_qsci_metadata)
-       FILE(READ ${_qsci_metadata} _qsci_metadata_contents)
-       STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents})
-@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR)
-     ENDIF(_qsci_metadata)
-
-     IF(QSCI_MOD_VERSION_STR)
--      SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}")
-+      SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt6/bindings")
-       SET(QSCI_FOUND TRUE)
-     ENDIF(QSCI_MOD_VERSION_STR)
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 82baf6af3594..c3ace3ca108f 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -89,14 +89,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "qgis-unwrapped";
-  version = "4.0.3";
+  version = "4.2.1";
   outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-vHKDc+OeIVfi+7Gp1ROUDYon+wKb24Nr5nCVfmhknvc=";
+    hash = "sha256-tdZNSA6kZHwS96YRbN7YF+ODPJrnINa/QGCo8pw196I=";
   };
 
   passthru = {
@@ -161,10 +161,6 @@ stdenv.mkDerivation rec {
   ++ pythonBuildInputs;
 
   patches = [
-    (replaceVars ./set-pyqt6-package-dirs.patch {
-      pyQt6PackageDir = "${py.pkgs.pyqt6}/${py.pkgs.python.sitePackages}";
-      qsciPackageDir = "${py.pkgs.pyqt6-qscintilla}/${py.pkgs.python.sitePackages}";
-    })
     (replaceVars ./spatialite-path.patch {
       spatialiteLib = "${libspatialite}/lib/mod_spatialite${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
@@ -184,6 +180,10 @@ stdenv.mkDerivation rec {
 
     # See https://github.com/libspatialindex/libspatialindex/issues/276
     "-DWITH_INTERNAL_SPATIALINDEX=True"
+
+    "-DPYQT6_DIST_INFO=${py.pkgs.pyqt6}/${py.pkgs.python.sitePackages}/pyqt6-${py.pkgs.pyqt6.version}.dist-info"
+    "-DQSCI_DIST_INFO=${py.pkgs.pyqt6-qscintilla}/${py.pkgs.python.sitePackages}/pyqt6_qscintilla-${py.pkgs.pyqt6-qscintilla.version}.dist-info"
+    "-DQSCI_SIP_DIR=${py.pkgs.pyqt6-qscintilla}/${py.pkgs.python.sitePackages}/PyQt6/bindings"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "-DQGIS_MACAPP_BUNDLE=0"