Author: eelco
Date: Sun Feb 26 11:10:00 2012
New Revision: 32573
URL: https://nixos.org/websvn/nix/?rev=32573&sc=1
Log:
* 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.
Modified:
nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix
nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix Sun Feb 26
11:07:56 2012 (r32572)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/gem.nix Sun Feb 26
11:10:00 2012 (r32573)
@@ -31,7 +31,8 @@
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
Modified: nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix Sun Feb
26 11:07:56 2012 (r32572)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/patches.nix Sun Feb
26 11:10:00 2012 (r32573)
@@ -61,4 +61,11 @@
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 : .";
+ };
+
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
