diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-26 11:10:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-26 11:10:00 +0000 |
| commit | a488f53a54051910d84724ad99f4c69e19a3cf78 (patch) | |
| tree | ee9184698b609490e7768800c097977d7c328ff0 /pkgs/development | |
| parent | 91e3d54b8f62249ff54e288f15354d669aed537d (diff) | |
| download | nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.tar nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.tar.gz nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.tar.bz2 nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.tar.lz nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.tar.xz nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.tar.zst nixpkgs-a488f53a54051910d84724ad99f4c69e19a3cf78.zip | |
* 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
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/ruby/gem.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patches.nix | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index a64f10e268c..8ec80b785de 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 37f103f7772..a2d2d753a4a 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 : ."; + }; + } |