From 1b2cc71e686122644b8efe926f241eafbb045e2a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 22 Oct 2017 04:09:17 +0300 Subject: cura: build with Qt 5.6 Workaround https://github.com/Ultimaker/Cura/issues/2596 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a961dd1ce00..dfacf2099265 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16522,7 +16522,7 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = qt56.callPackage ../applications/misc/cura { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b27147e18b50..c73ca736a978 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -256,6 +256,10 @@ in { 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 { pythonPackages = self; }; @@ -26536,7 +26540,10 @@ EOF 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 { }; -- cgit 1.4.1