From 9b07d48d9c12cb889c0732bfa0e02fa048a3e61a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 10 Dec 2018 16:13:59 -0500 Subject: [PATCH] pyqt5: remove old fixes Since about 5 hydra evaluations ago the build log has: substituteStream(): WARNING: pattern 'install_dir=pydbusmoddir' doesn't match anything in file 'configure.py' substituteStream(): WARNING: pattern 'ModuleMetadata(qmake_QT=['webkitwidgets'])' doesn't match anything in file 'configure.py' Looking at the original configure.py I don't see any mention of pydbusmoddir and ModuleMetadata seems to be set like the patch suggests: 'QtWebKitWidgets': ModuleMetadata( qmake_QT=['webkitwidgets', 'printsupport']), It appears that we don't need the fix anymore. Reverts: d3ed0ab32b ('PyQt: fix build') --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 14d7bddbb709..17b4ecb75d96 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -49,10 +49,6 @@ in buildPythonPackage { export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} - substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/${python.sitePackages}/dbus/mainloop'" \ - --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" - ${python.executable} configure.py -w \ --confirm-license \ --dbus=${dbus.dev}/include/dbus-1.0 \