ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 16:45:51 +03:00
Code Issues Projects Releases Wiki Activity

cq-editor: Use qt5.15 completely.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/cq-editor/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

@ -20098,7 +20098,7 @@ in
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;
};