Merge pull request #630 from lovek323/sup

sup: add missing dependencies
This commit is contained in:
Peter Simons 2013-06-15 04:27:37 -07:00
commit 362a77ad85
2 changed files with 21 additions and 16 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup { stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
, xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic , xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic
, trollop, lockfile, gettext, iconv }: , trollop, lockfile, gettext, iconv, locale, text }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4"; name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4";
@ -32,16 +32,18 @@ stdenv.mkDerivation {
export HOME=$TMP/home; mkdir -pv "$HOME" export HOME=$TMP/home; mkdir -pv "$HOME"
GEM_PATH="$GEM_PATH:$out/${ruby.gemPath}" 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:${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:${gettext}/${ruby.gemPath}"
GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}"
GEM_PATH="$GEM_PATH:${iconv}/${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 # Don't install some dependencies -- we have already installed
# the dependencies but gem doesn't acknowledge this # the dependencies but gem doesn't acknowledge this

View File

@ -7809,18 +7809,21 @@ let
ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
sup = callPackage ../applications/networking/mailreaders/sup { sup = callPackage ../applications/networking/mailreaders/sup {
rake = rubyLibs.rake_10_0_4;
ruby = ruby19; ruby = ruby19;
xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5;
gpgme = ruby_gpgme;
ncursesw_sup = ruby_ncursesw_sup;
rmail = rubyLibs.rmail;
mime_types = rubyLibs.mime_types;
chronic = rubyLibs.chronic; chronic = rubyLibs.chronic;
trollop = rubyLibs.trollop;
lockfile = rubyLibs.lockfile;
gettext = rubyLibs.gettext; gettext = rubyLibs.gettext;
gpgme = ruby_gpgme;
iconv = rubyLibs.iconv; 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;
text = rubyLibs.text;
trollop = rubyLibs.trollop;
xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5;
}; };
msmtp = callPackage ../applications/networking/msmtp { }; msmtp = callPackage ../applications/networking/msmtp { };