3 files changed, 22 insertions, 61 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 86b82db60e14..b1b451855110 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -41,25 +41,43 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo}
+    
+    substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
+
+    substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
 
+    substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
+
+    substituteInPlace src/cli/mesos-scp        \
+      --replace "'scp " "'${openssh}/bin/scp "
+
+    substituteInPlace src/launcher/executor.cpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
+    
     substituteInPlace src/launcher/fetcher.cpp \
       --replace '"gzip' '"${gzip}/bin/gzip'    \
       --replace '"tar' '"${gnutar}/bin/tar'    \
       --replace '"unzip' '"${unzip}/bin/unzip'
 
-    substituteInPlace src/cli/mesos-scp        \
-      --replace "'scp " "'${openssh}/bin/scp "
-
     substituteInPlace src/python/cli/src/mesos/cli.py \
      --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'"
+    
+    substituteInPlace src/slave/containerizer/mesos/launch.cpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
 
-  '' + lib.optionalString (stdenv.isLinux) ''
+  '' + lib.optionalString stdenv.isLinux ''
 
     substituteInPlace configure.ac             \
       --replace /usr/include/libnl3 ${libnl}/include/libnl3
 
     substituteInPlace src/linux/perf.cpp       \
       --replace '"perf ' '"${perf}/bin/perf '
+    
+    substituteInPlace src/linux/systemd.cpp \
+      --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"'
 
     substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \
       --replace '"mount ' '"${utillinux}/bin/mount ' \
@@ -72,15 +90,6 @@ in stdenv.mkDerivation rec {
       --replace '"ip ' '"${iproute}/bin/ip '   \
       --replace '"mount ' '"${utillinux}/bin/mount ' \
       --replace '/bin/sh' "${stdenv.shell}"
-    
-    substituteInPlace src/launcher/executor.cpp \
-      --replace '"sh"' '"${bash}/bin/bash"'
-    
-    substituteInPlace src/slave/containerizer/mesos/launch.cpp \
-      --replace '"sh"' '"${bash}/bin/bash"'
-    
-    substituteInPlace src/linux/systemd.cpp \
-      --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"'
   '';
 
   configureFlags = [
diff --git a/pkgs/applications/networking/cluster/rq/default.nix b/pkgs/applications/networking/cluster/rq/default.nix
deleted file mode 100644
index fdf11adfb6c0..000000000000
--- a/pkgs/applications/networking/cluster/rq/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{stdenv, fetchurl, sqlite, ruby }:
-
-# Package builds rq with all dependencies into one blob. This to ascertain
-# the combination of packages works.
-
-stdenv.mkDerivation {
-  name = "rq-3.4.0";
-  src = fetchurl {
-    url = http://www.codeforpeople.com/lib/ruby/rq/rq-3.4.0.tgz;
-    sha256 = "1g8wiv83dcn4vzk9wjjzs9vjnwzwpy4h84h34cj32wfz793wfb8b";
-  };
-
-  buildInputs = [ ruby ];
-
-  # patch checks for existing stdin file - sent it upstream
-  patches = [ ./rq.patch ];
-
-  buildPhase = ''
-    cd all
-    ./install.sh $out
-    cd ..
-  '';
-
-  installPhase = ''
-  '';
-
-  meta = {
-    license = stdenv.lib.licenses.ruby;
-    homepage = "http://www.codeforpeople.com/lib/ruby/rq/";
-    description = "Simple cluster queue runner";
-    longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions.";
-    pkgMaintainer = "Pjotr Prins";
-    # rq installs a separate Ruby interpreter, which has lower priority
-    priority = "10";
-  };
-}
diff --git a/pkgs/applications/networking/cluster/rq/rq.patch b/pkgs/applications/networking/cluster/rq/rq.patch
deleted file mode 100644
index d57c7d0a71a8..000000000000
--- a/pkgs/applications/networking/cluster/rq/rq.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r b58e759f84db lib/rq/jobrunner.rb
---- a/lib/rq/jobrunner.rb	Sun Sep 28 13:33:06 2008 +0200
-+++ b/lib/rq/jobrunner.rb	Sun Sep 28 13:35:09 2008 +0200
-@@ -85,7 +85,7 @@ unless defined? $__rq_jobrunner__
- 
-         command =
-           if @sh_like 
--            sin = "0<#{ @stdin }" if @stdin
-+            sin = "0<#{ @stdin }" if @stdin and File.exist?(@stdin)
-             sout = "1>#{ @stdout }" if @stdout
-             serr = "2>#{ @stderr }" if @stderr
-             "( PATH=#{ path }:$PATH #{ command } ;) #{ sin } #{ sout } #{ serr }"