about summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2019-10-04 00:44:25 +0800
committerGitHub <noreply@github.com>2019-10-04 00:44:25 +0800
commit95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5 (patch)
tree349931f10a0a248a7ac4f81b05de523134a3e6c4 /pkgs/development/python-modules
parent2d9eb216020fcd5d6c10b087a6f76d46313a5079 (diff)
parent5d8ec9b99b49fcefb5527e0beffec7a656ea9112 (diff)
downloadnixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.tar
nixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.tar.gz
nixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.tar.bz2
nixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.tar.lz
nixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.tar.xz
nixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.tar.zst
nixlib-95a3c8d151b085f99ee64f0c1ac6b2fb486ed0f5.zip
Merge pull request #68375 from lsix/qgis-3.8.2
qgis: 3.8.0 -> 3.8.3
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/qscintilla-qt5/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index e8076db60534..06475c09ca8b 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/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 \