diff options
Diffstat (limited to 'pkgs/applications/misc/cura/default.nix')
-rw-r--r-- | pkgs/applications/misc/cura/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 290801ea578..084881f75d9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,21 +1,21 @@ { mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { - name = "cura-${version}"; - version = "4.1.0"; + pname = "cura"; + version = "4.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz"; + sha256 = "1qnai8vmgy5lx3lapw96j41i8mw9p6r99i3qzs709l9yzrix6l86"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = version; - sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl"; + rev = "4.2.0"; # TODO: change back to `version` after 4.2.1 + sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; @@ -29,6 +29,11 @@ mkDerivation rec { "-DCURA_VERSION=${version}" ]; + makeWrapperArgs = [ + # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901 + "--set OMP_NUM_THREADS 1" + ]; + postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py @@ -45,6 +50,7 @@ mkDerivation rec { postFixup = '' wrapPythonPrograms + wrapQtApp $out/bin/cura ''; meta = with lib; { @@ -52,6 +58,6 @@ mkDerivation rec { homepage = https://github.com/Ultimaker/Cura; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } |