1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index c4da956b57c8..e236a71b5542 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -1,5 +1,5 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
-, zlib, libuuid, gems, jdk, python, stdenv }:
+, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty }:
 
 let
 
@@ -13,7 +13,7 @@ let
 in
 
 {
-  sup = { buildInputs = [ gems.ncursesw ]; };
+  iconv = { buildInputs = [ libiconvOrEmpty ]; };
 
   libv8 = {
     # This fix is needed to fool scons, which clears the environment by default.
@@ -35,11 +35,17 @@ in
       EOF
       chmod +x $TMPDIR/g++
       
-      
       export CXX=$TMPDIR/g++
       export AR=$(type -p ar)
     '';
     buildInputs = [ python ];
+    NIX_POST_EXTRACT_FILES_HOOK = writeScript "patch-scons" ''
+      #!/bin/sh
+      for i in `find "$1" -name scons`
+      do
+          sed -i -e "s@/usr/bin/env@$(type -p env)@g" $i
+      done
+    '';
   };
   
   sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
@@ -91,6 +97,14 @@ in
     gemFlags = "--no-rdoc --no-ri";
   };
 
+  xapian_full_alaveteli = {
+    buildInputs = [ zlib libuuid ];
+  };
+
+  xapian_ruby = {
+    buildInputs = [ zlib libuuid ];
+  };
+
   rjb = {
     buildInputs = [ jdk ];
     JAVA_HOME = jdk;