diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-05 13:05:54 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-05 13:05:54 +0200 |
| commit | dfd4ada456359ac06613d527efeacc370c0f85bd (patch) | |
| tree | 6252654da69f39af14b189da3d29b24d2d233b60 /pkgs/desktops/kde-4.14/kdeedu | |
| parent | ee0ecb520eb3577e2d508fc11dbc057aca9b6c23 (diff) | |
| download | nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.tar nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.tar.gz nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.tar.bz2 nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.tar.lz nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.tar.xz nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.tar.zst nixlib-dfd4ada456359ac06613d527efeacc370c0f85bd.zip | |
kde4: fix cantor build
Diffstat (limited to 'pkgs/desktops/kde-4.14/kdeedu')
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdeedu/cantor.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 | 42 |
2 files changed, 44 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix index a8cd2e44957a..625a2678e48b 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 000000000000..66e756e21bb8 --- /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 <Rversion.h> + #include <Rdefines.h> + #define R_INTERFACE_PTRS +-#include <Rinterface.h> + #include <R_ext/Parse.h> + + //This File implements the necessary callbacks for R +commit 846cf02ab1618b9322b83eafc18dff3264988b72 +Author: Raymond Wooninck <tittiatcoke@gmail.com> +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 <QStringList> + + #include <stdio.h> ++#include <Rinterface.h> + + 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 <Rversion.h> + #include <Rdefines.h> + #define R_INTERFACE_PTRS +-#include <Rinterface.h> + #include <R_ext/Parse.h> + + // Not making a member to prevent pulling R headers into rserver.h |