public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cura: build with Qt 5.6

Browse Source 
Workaround https://github.com/Ultimaker/Cura/issues/2596
This commit is contained in:
Nikolay Amiantov 2017-10-22 04:09:17 +03:00
parent e458c44c2b
commit 1b2cc71e68
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16522,7 +16522,7 @@ with pkgs;
curaengine = callPackage ../applications/misc/curaengine { curaengine = callPackage ../applications/misc/curaengine {
inherit (python3.pkgs) libarcus; inherit (python3.pkgs) libarcus;
}; };
cura = qt5.callPackage ../applications/misc/cura { }; cura = qt56.callPackage ../applications/misc/cura { };
curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };

9
pkgs/top-level/python-packages.nix
View File

@ -256,6 +256,10 @@ in {
pythonPackages = self; pythonPackages = self;
}; };
pyqt56 = pkgs.libsForQt56.callPackage ../development/python-modules/pyqt/5.x.nix {
pythonPackages = self;
};
pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
pythonPackages = self; pythonPackages = self;
}; };
@ -26536,7 +26540,10 @@ EOF
twilio = callPackage ../development/python-modules/twilio { }; twilio = callPackage ../development/python-modules/twilio { };
uranium = callPackage ../development/python-modules/uranium { }; uranium = callPackage ../development/python-modules/uranium {
# https://github.com/Ultimaker/Cura/issues/2596
pyqt5 = self.pyqt56;
};
vine = callPackage ../development/python-modules/vine { }; vine = callPackage ../development/python-modules/vine { };