From 15333c2665081738b8ff0a69524c88f74bbaf1ea Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 21 Jan 2011 08:24:57 +0000
Subject: [PATCH] Adjust description

svn path=/nixpkgs/trunk/; revision=25655
---
 pkgs/development/interpreters/ruby/libs.nix     | 14 --------------
 pkgs/development/interpreters/ruby/rubygems.nix | 14 +++++++++-----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix
index 5b092771cf8..29b15d2222c 100644
--- a/pkgs/development/interpreters/ruby/libs.nix
+++ b/pkgs/development/interpreters/ruby/libs.nix
@@ -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}:
 
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 1e037bb785c..6c0cef9b4d1 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -16,7 +16,7 @@ rec {
 
   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 @@ rec {
   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 ];
 }