From a488f53a54051910d84724ad99f4c69e19a3cf78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Feb 2012 11:10:00 +0000
Subject: [PATCH] * Many buildr Buildfiles rely on RUBYLIB containing the
 current directory   (as was the default in Ruby < 1.9.2).  So make sure
 that's the case   when running buildr.

svn path=/nixpkgs/trunk/; revision=32573
---
 pkgs/development/interpreters/ruby/gem.nix     | 3 ++-
 pkgs/development/interpreters/ruby/patches.nix | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
index a64f10e268cc..8ec80b785de0 100644
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ b/pkgs/development/interpreters/ruby/gem.nix
@@ -31,7 +31,8 @@ let
         wrapProgram "$prog" \
           --prefix GEM_PATH : "$GEM_PATH" \
           --prefix RUBYLIB : "${rubygems}/lib" \
-          --set RUBYOPT 'rubygems'
+          --set RUBYOPT rubygems \
+          $extraWrapperFlags ''${extraWrapperFlagsArray[@]}
       done
 
       for prog in $out/gems/*/bin/*; do
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 37f103f7772d..a2d2d753a4af 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -61,4 +61,11 @@ in
     buildInputs = [ jdk ];
     JAVA_HOME = jdk;
   };
+
+  buildr = {
+    # Many Buildfiles rely on RUBYLIB containing the current directory
+    # (as was the default in Ruby < 1.9.2).
+    extraWrapperFlags = "--prefix RUBYLIB : .";
+  };
+  
 }