diff options
| author | Ambroz Bizjak <ambrop7@gmail.com> | 2016-06-15 14:42:32 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-06-15 13:42:32 +0100 |
| commit | 7102c3c0c4eea385f5f2d7b52dab37ba46216356 (patch) | |
| tree | 853d5695b0bd6c23203ddf301d58415ddeeaafb2 /pkgs/applications/misc/cura | |
| parent | 3bbdfe5df7693b01b35365a0796bb4e29f425167 (diff) | |
| download | nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.tar nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.tar.gz nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.tar.bz2 nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.tar.lz nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.tar.xz nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.tar.zst nixlib-7102c3c0c4eea385f5f2d7b52dab37ba46216356.zip | |
cura: Fix breakage due to numpy change. (#16234)
Upstream bug report: https://github.com/daid/Cura/issues/1461
Diffstat (limited to 'pkgs/applications/misc/cura')
| -rw-r--r-- | pkgs/applications/misc/cura/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/cura/numpy-cast.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a711cc1db87c..a53b001b0e98 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 000000000000..efb14182b3e6 --- /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 |