From b83d9bd7050f54170d6a537db200cfd7f46acee8 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:10:35 -0500
Subject: [PATCH] pythonPackages.qscintilla-qt5: fix darwin linking

---
 .../python-modules/qscintilla-qt5/default.nix | 43 ++++---------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 3ccb9a22d370..afc684b3b0e8 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -17,31 +17,18 @@ in buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  nativeBuildInputs = [ sip qmake pyqt-builder ];
-  buildInputs = [ qtbase qscintilla ];
+  nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
 
   dontWrapQtApps = true;
 
-  # postPatch = ''
-  #   substituteInPlace Python/configure.py \
-  #     --replace \
-  #     "target_config.py_module_dir" \
-  #     "'$out/${python.sitePackages}'"
-  # '';
-  #
-
-  qsciFeaturesDir = qscintilla + "/mkspecs/features";
-  qsciIncludeDir = qscintilla + "/include";
-  qsciLibraryDir = qscintilla + "/lib";
-  sipIncludeDirs = pyqt5 + "/" + python.sitePackages + "/PyQt5/bindings";
-  apiDir = qscintilla + "/share";
-
   postPatch = ''
     cd Python
     cp pyproject-qt5.toml pyproject.toml
     echo '[tool.sip.project]' >> pyproject.toml
-    echo 'sip-include-dirs = [ "${sipIncludeDirs}"]' >> pyproject.toml
+    echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \
+       >> pyproject.toml
   '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace project.py \
       --replace \
@@ -56,24 +43,12 @@ in buildPythonPackage rec {
   '';
 
   dontConfigure = true;
-    # substituteInPlace configure.py \
-    #   --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
-    # ${python.executable} ./configure.py \
-    #   --pyqt=PyQt5 \
-    #   --destdir=$out/${python.sitePackages}/PyQt5 \
-    #   --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}/${python.sitePackages}/PyQt5/bindings \
-    #   --qsci-sipdir=$out/share/sip/PyQt5 \
-    #   --sip-incdir=${sip}/include
-    #
-
-  build = "sip-install --qsci-features-dir ${qsciFeaturesDir} --qsci-include-dir ${qsciIncludeDir} \
-           --qsci-library-dir ${qsciLibraryDir} --api-dir ${apiDir}";
 
+  build = ''
+    sip-install --qsci-features-dir ${qscintilla}/mkspecs/features \
+    --qsci-include-dir ${qscintilla}/include \
+    --qsci-library-dir ${qscintilla}/lib --api-dir ${qscintilla}/share";
+  '';
   postInstall = ''
     # Needed by pythonImportsCheck to find the module
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"