about summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2015-08-07 18:13:27 +0200
committerPascal Wittmann <mail@pascal-wittmann.de>2015-08-07 18:14:18 +0200
commit590e11bc534b90ce8de3eb27753761f2d5af1612 (patch)
tree5f0fa47fa1406a52fbfd7c1b51768c3b713f9151 /pkgs/applications/networking/cluster
parent45c284c9554ba50ca009007ac708d7d3b6c04077 (diff)
mesos: fix build by applying patch from review.apache.org
Diffstat (limited to 'pkgs/applications/networking/cluster')
-rw-r--r--pkgs/applications/networking/cluster/mesos/default.nix5
-rw-r--r--pkgs/applications/networking/cluster/mesos/rb36610.patch11
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index f9c34fdd29df8..6f92ca5a6b705 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -19,6 +19,11 @@ in stdenv.mkDerivation rec {
     sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
   };
 
+  patches = [
+    # https://reviews.apache.org/r/36610/
+    ./rb36610.patch
+  ];
+
   buildInputs = [
     makeWrapper autoconf automake114x libtool curl sasl jdk maven
     python wrapPython boto distutils-cfg setuptools leveldb
diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch
new file mode 100644
index 0000000000000..c3b1b290422a9
--- /dev/null
+++ b/pkgs/applications/networking/cluster/mesos/rb36610.patch
@@ -0,0 +1,11 @@
+diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
+index ea0891e320154b85a21ed2d138c192821efae9cd..7b24c377c9a28cad91738305c273fb53a4dc7365 100644
+--- a/src/linux/fs.cpp
++++ b/src/linux/fs.cpp
+@@ -19,6 +19,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <syscall.h>
+
+ #include <linux/limits.h>