diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix index a8cd2e44957..625a2678e48 100644 --- a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix +++ b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix @@ -7,6 +7,8 @@ kde { nativeBuildInputs = [ pkgconfig ]; + patches = [ ./commit-846cf02 ]; + meta = { description = "KDE Frontend to Mathematical Software"; }; diff --git a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 new file mode 100644 index 00000000000..66e756e21bb --- /dev/null +++ b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 @@ -0,0 +1,42 @@ +diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h +index 8f4752c..6d0e9a2 100644 +--- a/src/backends/R/rserver/rcallbacks.h ++++ b/src/backends/R/rserver/rcallbacks.h +@@ -30,7 +30,6 @@ class Expression; + #include + #include + #define R_INTERFACE_PTRS +-#include + #include + + //This File implements the necessary callbacks for R +commit 846cf02ab1618b9322b83eafc18dff3264988b72 +Author: Raymond Wooninck +Date: Mon Apr 27 16:08:51 2015 +0200 + + Also build against R >= 3.2. + +diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp +index 2c86531..492f270 100644 +--- a/src/backends/R/rserver/rcallbacks.cpp ++++ b/src/backends/R/rserver/rcallbacks.cpp +@@ -26,6 +26,7 @@ + #include + + #include ++#include + + RServer* server; + Expression* currentExpression; +diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp +index 30cdb70..f689f42 100644 +--- a/src/backends/R/rserver/rserver.cpp ++++ b/src/backends/R/rserver/rserver.cpp +@@ -42,7 +42,6 @@ + #include + #include + #define R_INTERFACE_PTRS +-#include + #include + + // Not making a member to prevent pulling R headers into rserver.h