public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cura: Fix breakage due to numpy change. (#16234)

Browse Source 
Upstream bug report: https://github.com/daid/Cura/issues/1461
This commit is contained in:
Ambroz Bizjak
2016-06-15 13:42:32 +01:00
committed by Domen Kožar
parent 3bbdfe5df7
commit 7102c3c0c4
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/cura/default.nix
+2
View File
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
configurePhase = ""; configurePhase = "";
buildPhase = ""; buildPhase = "";
patches = [ ./numpy-cast.patch ];
installPhase = '' installPhase = ''
# Install Python code. # Install Python code.
site_packages=$out/lib/python2.7/site-packages site_packages=$out/lib/python2.7/site-packages
pkgs/applications/misc/cura/numpy-cast.patch
+12
View File
@@ -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