From 7102c3c0c4eea385f5f2d7b52dab37ba46216356 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Wed, 15 Jun 2016 14:42:32 +0200 Subject: [PATCH] cura: Fix breakage due to numpy change. (#16234) Upstream bug report: https://github.com/daid/Cura/issues/1461 --- pkgs/applications/misc/cura/default.nix | 2 ++ pkgs/applications/misc/cura/numpy-cast.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/misc/cura/numpy-cast.patch diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a711cc1db87..a53b001b0e9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { configurePhase = ""; buildPhase = ""; + + patches = [ ./numpy-cast.patch ]; installPhase = '' # Install Python code. diff --git a/pkgs/applications/misc/cura/numpy-cast.patch b/pkgs/applications/misc/cura/numpy-cast.patch new file mode 100644 index 00000000000..efb14182b3e --- /dev/null +++ b/pkgs/applications/misc/cura/numpy-cast.patch @@ -0,0 +1,12 @@ +diff -urN Cura-15.04.old/Cura/util/sliceEngine.py Cura-15.04/Cura/util/sliceEngine.py +--- Cura-15.04.old/Cura/util/sliceEngine.py 2016-05-07 20:34:17.305020334 +0200 ++++ Cura-15.04/Cura/util/sliceEngine.py 2016-05-07 20:40:02.993286467 +0200 +@@ -343,7 +343,7 @@ + objMax[1] = max(oMax[1], objMax[1]) + if objMin is None: + return +- pos += (objMin + objMax) / 2.0 * 1000 ++ pos = numpy.add( pos, (objMin + objMax) / 2.0 * 1000, out=pos, casting='unsafe') + commandList += ['-s', 'posx=%d' % int(pos[0]), '-s', 'posy=%d' % int(pos[1])] + + vertexTotal = [0] * 4