Merge pull request #630 from lovek323/sup

sup: add missing dependencies
NixOS · Jun 15, 2013 · 362a77a · 362a77a
2 parents 5a1e9a9 + d166efd
commit 362a77a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
 , xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic
-, trollop, lockfile, gettext, iconv }:
+, trollop, lockfile, gettext, iconv, locale, text }:
 
 stdenv.mkDerivation {
   name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4";
@@ -32,16 +32,18 @@ stdenv.mkDerivation {
     export HOME=$TMP/home; mkdir -pv "$HOME"
 
     GEM_PATH="$GEM_PATH:$out/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}"
     GEM_PATH="$GEM_PATH:${chronic}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}"
     GEM_PATH="$GEM_PATH:${gettext}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}"
     GEM_PATH="$GEM_PATH:${iconv}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${locale}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}"
 
     # Don't install some dependencies -- we have already installed
     # the dependencies but gem doesn't acknowledge this

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -7809,18 +7809,21 @@ let
   ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
 
   sup = callPackage ../applications/networking/mailreaders/sup {
-    rake = rubyLibs.rake_10_0_4;
     ruby = ruby19;
-    xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5;
+
+    chronic = rubyLibs.chronic;
+    gettext = rubyLibs.gettext;
     gpgme = ruby_gpgme;
+    iconv = rubyLibs.iconv;
+    locale = rubyLibs.locale;
+    lockfile = rubyLibs.lockfile;
+    mime_types = rubyLibs.mime_types;
     ncursesw_sup = ruby_ncursesw_sup;
+    rake = rubyLibs.rake_10_0_4;
     rmail = rubyLibs.rmail;
-    mime_types = rubyLibs.mime_types;
-    chronic = rubyLibs.chronic;
+    text = rubyLibs.text;
     trollop = rubyLibs.trollop;
-    lockfile = rubyLibs.lockfile;
-    gettext = rubyLibs.gettext;
-    iconv = rubyLibs.iconv;
+    xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5;
   };
 
   msmtp = callPackage ../applications/networking/msmtp { };