From 001999e25b746f2ce8e23fc2010f8bb25d10810e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Dec 2019 07:26:11 +0000 Subject: [PATCH] python3.pkgs.qscintilla-qt5: don't propagate pyqt5 Since this package symlinks pyqt5 in its own tree, propagating pyqt5 is detected as a conflict by our python setup hook. --- pkgs/development/python-modules/qscintilla-qt5/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 96485bd1f06..b5ce1eb26fe 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -12,8 +12,7 @@ buildPythonPackage { format = "other"; nativeBuildInputs = [ lndir sip qtbase ]; - buildInputs = [ qscintilla ]; - propagatedBuildInputs = [ pyqt5 ]; + buildInputs = [ qscintilla pyqt5 ]; postPatch = '' substituteInPlace Python/configure.py \