about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2019-12-21 07:26:11 +0000
committerJörg Thalheim <joerg@thalheim.io>2019-12-21 07:33:00 +0000
commit001999e25b746f2ce8e23fc2010f8bb25d10810e (patch)
tree8974b8d75295848cdeaff639c94394e758697253
parent88a473fc12e24ba850ae4b120ae0c766d9dd6840 (diff)
downloadnixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.tar
nixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.tar.gz
nixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.tar.bz2
nixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.tar.lz
nixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.tar.xz
nixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.tar.zst
nixlib-001999e25b746f2ce8e23fc2010f8bb25d10810e.zip
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.
-rw-r--r--pkgs/development/python-modules/qscintilla-qt5/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 96485bd1f062..b5ce1eb26fe1 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 \