Merge pull request #68375 from lsix/qgis-3.8.2

qgis: 3.8.0 -> 3.8.3

pkgs/development/libraries/qscintilla/default.nix

@@ -34,15 +34,16 @@ in stdenv.mkDerivation rec {
 
   patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];
 
+  # Make sure that libqscintilla2.so is available in $out/lib since it is expected
+  # by some packages such as sqlitebrowser
+  postFixup = ''
+    ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
+  '';
+
   enableParallelBuilding = true;
 
-  # By default qscintilla will name the library with a qt version suffix which
-  # confuses the crap out of sqlitebrowser and possibly others so we simply
-  # strip the suffix as we don't need it and the various FindQScintilla.cmake
-  # files floating around *should* look for the un-suffixed version.
   postPatch = ''
     substituteInPlace qscintilla.pro \
-      --replace '_qt$''${QT_MAJOR_VERSION}'   "" \
       --replace '$$[QT_INSTALL_LIBS]'         $out/lib \
       --replace '$$[QT_INSTALL_HEADERS]'      $out/include \
       --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \

pkgs/development/python-modules/qscintilla-qt5/default.nix

@@ -15,6 +15,13 @@ buildPythonPackage {
   buildInputs = [ qscintilla ];
   propagatedBuildInputs = [ pyqt5 ];
 
+  postPatch = ''
+    substituteInPlace Python/configure.py \
+      --replace \
+      "target_config.py_module_dir" \
+      "'$out/${python.sitePackages}'"
+  '';
+
   preConfigure = ''
     mkdir -p $out
     lndir ${pyqt5} $out
@@ -26,6 +33,7 @@ buildPythonPackage {
       --stubsdir=$out/${python.sitePackages}/PyQt5 \
       --apidir=$out/api/${python.libPrefix} \
       --qsci-incdir=${qscintilla}/include \
+      --qsci-featuresdir=${qscintilla}/mkspecs/features \
       --qsci-libdir=${qscintilla}/lib \
       --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
       --qsci-sipdir=$out/share/sip/PyQt5 \