cq-editor: Use qt5.15 completely.

Don't mix qt5.14 and pyqt5 which uses qt5.15 (#99956).
This commit is contained in:
Doron Behar 2020-10-08 14:59:26 +03:00 committed by Frederik Rietdijk
parent bc0113e2c2
commit 16c2b3c614
2 changed files with 5 additions and 3 deletions

View file

@ -2,6 +2,7 @@
, mkDerivationWith , mkDerivationWith
, python3Packages , python3Packages
, fetchFromGitHub , fetchFromGitHub
, wrapQtAppsHook
}: }:
mkDerivationWith python3Packages.buildPythonApplication rec { mkDerivationWith python3Packages.buildPythonApplication rec {
@ -27,8 +28,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
requests requests
]; ];
postFixup = '' nativeBuildInputs = [ wrapQtAppsHook ];
wrapQtApp "$out/bin/cq-editor" preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
''; '';
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [

View file

@ -20098,7 +20098,7 @@ in
coyim = callPackage ../applications/networking/instant-messengers/coyim {}; coyim = callPackage ../applications/networking/instant-messengers/coyim {};
cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor {
python3Packages = python37Packages; python3Packages = python37Packages;
}; };