diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 4d63cb5f4548..2ee9c82f08db 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -1,7 +1,6 @@ { lib , pythonPackages , qscintilla -, lndir , qtbase }: with pythonPackages; @@ -11,8 +10,9 @@ buildPythonPackage { src = qscintilla.src; format = "other"; - nativeBuildInputs = [ lndir sip qtbase ]; - buildInputs = [ qscintilla pyqt5 ]; + nativeBuildInputs = [ sip qtbase ]; + buildInputs = [ qscintilla ]; + propagatedBuildInputs = [ pyqt5 ]; postPatch = '' substituteInPlace Python/configure.py \ @@ -22,9 +22,9 @@ buildPythonPackage { ''; preConfigure = '' - mkdir -p $out - lndir ${pyqt5} $out - rm -rf "$out/nix-support" + # configure.py will look for this folder + mkdir -p $out/share/sip/PyQt5 + cd Python substituteInPlace configure.py \ --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d4a3ad052bf..1268c43a525a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5637,7 +5637,6 @@ in { qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; - lndir = pkgs.xorg.lndir; }; qscintilla = self.qscintilla-qt4;