diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2019-04-04 09:52:38 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2019-04-04 09:52:38 +0200 |
| commit | 66c8e4bc7a92f6283cf47d732d6cce0d8722fa11 (patch) | |
| tree | 5a25df832ce6c7edcc373df773bab492698a2a20 /pkgs/applications/misc/cura | |
| parent | a4b277eda5b993114eaf06120b04aee6e243a3ba (diff) | |
cura: 3.6.0 -> 4.0.0
Diffstat (limited to 'pkgs/applications/misc/cura')
| -rw-r--r-- | pkgs/applications/misc/cura/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index f7907746d1072..d570a2570d1ce 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine }: mkDerivation rec { name = "cura-${version}"; - version = "3.6.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90"; + sha256 = "18pxlmrw8m2mir177f0j9bma7rk29vam91gd86c0d458nw21q2qf"; }; materials = fetchFromGitHub { @@ -18,7 +18,7 @@ mkDerivation rec { sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; }; - buildInputs = [ qtbase qtquickcontrols2 ]; + buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf ]; @@ -27,6 +27,12 @@ mkDerivation rec { cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" "-DCURA_VERSION=${version}" + + # see https://github.com/Ultimaker/Cura/issues/5142 + "-DCURA_SDK_VERSION=6.0.0" + + # remove after 4.0.0, see https://github.com/void-linux/void-packages/pull/9880#issuecomment-475453025 + "-DCURA_CLOUD_API_VERSION=1" ]; postPatch = '' |