Author: urkud
Date: Fri Jan 21 08:24:57 2011
New Revision: 25655
URL: https://svn.nixos.org/websvn/nix/?rev=25655&sc=1
Log:
Adjust description
Modified:
nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix
nixpkgs/trunk/pkgs/development/interpreters/ruby/rubygems.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix Fri Jan 21
08:24:52 2011 (r25654)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/libs.nix Fri Jan 21
08:24:57 2011 (r25655)
@@ -1,17 +1,3 @@
-/* libraries and applications from rubyforge
-
- run
- $gem nix $EXSTING_TARGETS new-target-package
-
- EXSTING_TARGETS can be looked up below after "has been generated by "
-
- Don't forget add
- export GEM_PATH=~/.nix/profile
- export RUBYLIB=~/.nix-profile/gems/rubygems-update-1.3.4/lib/
- export RUBYOPT=rubygems
- to your .bashrc
-*/
-
{stdenv, fetchurl, writeScript, makeWrapper, rubygems, ruby,
ncurses, xapianBindings, sqlite, libxml2, libxslt, libffi, zlib, libuuid}:
Modified: nixpkgs/trunk/pkgs/development/interpreters/ruby/rubygems.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/ruby/rubygems.nix Fri Jan
21 08:24:52 2011 (r25654)
+++ nixpkgs/trunk/pkgs/development/interpreters/ruby/rubygems.nix Fri Jan
21 08:24:57 2011 (r25655)
@@ -16,7 +16,7 @@
doInstall = fullDepEntry (''
ruby setup.rb --prefix=$out/
- wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib
+ wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib
find $out -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p
env)@g"
mkdir -pv $out/nix-support
cat > $out/nix-support/setup-hook <<EOF
@@ -37,11 +37,15 @@
meta = {
description = "Ruby gems package collection";
longDescription = ''
- see comment in rubyLibs to get to know how to use ruby gems in nix
+ Nix can create nix packages from gems.
+
+ To use it do the following:
+ 1. Install rubygems and rubyLibs.nix.
+ 2. Add $your_profile/${ruby.gemPath} to GEM_PATH.
+ 3. export RUBYLIB=$your_profile/lib RUBYOPT=rubygems
+ 4. See `gem nix --help` for the rest.
'';
};
- # TODO don't resolve 302 redirects but make nix resolve in fetchurl and
- # nix-prefetch-url. This should be done on stdenv-updates.
- patches = [ ./gem_hook.patch /* see longDescription above */ ];
+ patches = [ ./gem_hook.patch ];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
