curaPlugins.octoprint: make compatible with cura 4.3.0

NixOS · Nov 1, 2019 · 895874d · 895874d · knedlsepp · Nov 2, 2019
1 parent 9ebe621
commit 895874d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python3Packages }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3Packages }:
 
 let
 
@@ -11,8 +11,8 @@ let
       src = fetchFromGitHub {
         owner = "fieldOfView";
         repo = pname;
-        rev = "46548cbb8d32d10fe3aee12f272d5d8f34271738";
-        sha256 = "0pllba8qx1746pnf5ccbkqn2j6f8hhknpgyrrv244ykvigrlczx0";
+        rev = "0702f3a52887ea4ab6736c990bbe9628d677688e";
+        sha256 = "0cm4kciw3izqk51pfbznawk80k7n7pyvrlzd9ccjgdl994ljcqi5";
       };
 
       nativeBuildInputs = [ cmake ];
@@ -21,6 +21,15 @@ let
         netifaces
       ];
 
+      patches = [
+        # Fix incorrect paths in CMakeLists.txt
+        # https://github.com/fieldOfView/Cura-OctoPrintPlugin/pull/131
+        (fetchpatch {
+          url = "https://github.com/gebner/Cura-OctoPrintPlugin/commit/fce8c21b3a584559da7942cb239fbf6673153454.patch";
+          sha256 = "06d82jpqvcpz90svhhlk2g3pvxm3psfnd2j30m6cl9441qp5nvcp";
+        })
+      ];
+
       meta = with stdenv.lib; {
         description = "Enables printing directly to OctoPrint and monitoring the process";
         homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";