diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-10-22 04:09:17 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-22 04:10:09 +0300 |
| commit | 1b2cc71e686122644b8efe926f241eafbb045e2a (patch) | |
| tree | e95296e3b891838099d5a8803d1c1f6745f1045a /pkgs/top-level | |
| parent | e458c44c2b7b2815104d4bf9894a08a41ae0cf6d (diff) | |
| download | nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.tar nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.tar.gz nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.tar.bz2 nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.tar.lz nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.tar.xz nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.tar.zst nixlib-1b2cc71e686122644b8efe926f241eafbb045e2a.zip | |
cura: build with Qt 5.6
Workaround https://github.com/Ultimaker/Cura/issues/2596
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 9 |
2 files changed, 9 insertions, 2 deletions
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 { }; |