3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request from khumba/claws-https-master

claws-mail: add glib_networking for fancy to load HTTPS content (for master)
This commit is contained in:
lethalman 2015-11-17 10:13:20 +01:00
commit 589ab6b217
2 changed files with 8 additions and 3 deletions
pkgs
applications/networking/mailreaders/claws-mail
top-level

View file

@ -1,7 +1,8 @@
{ fetchurl, stdenv { fetchurl, stdenv, wrapGAppsHook
, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme , curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme
, libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager , libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager
, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
, glib_networking, gsettings_desktop_schemas
# Build options # Build options
# TODO: A flag to build the manual. # TODO: A flag to build the manual.
@ -55,8 +56,8 @@ stdenv.mkDerivation {
''; '';
buildInputs = buildInputs =
[ curl dbus dbus_glib gtk gnutls hicolor_icon_theme [ curl dbus dbus_glib gtk gnutls gsettings_desktop_schemas hicolor_icon_theme
libetpan perl pkgconfig python libetpan perl pkgconfig python wrapGAppsHook
] ]
++ optional enableSpellcheck enchant ++ optional enableSpellcheck enchant
++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]
@ -91,6 +92,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
wrapPrefixVariables = [ "GIO_EXTRA_MODULES" ];
GIO_EXTRA_MODULES = "${glib_networking}/lib/gio/modules";
postInstall = '' postInstall = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp claws-mail.desktop $out/share/applications cp claws-mail.desktop $out/share/applications

View file

@ -11121,6 +11121,7 @@ let
cinelerra = callPackage ../applications/video/cinelerra { }; cinelerra = callPackage ../applications/video/cinelerra { };
clawsMail = callPackage ../applications/networking/mailreaders/claws-mail { clawsMail = callPackage ../applications/networking/mailreaders/claws-mail {
inherit (gnome3) gsettings_desktop_schemas;
enableNetworkManager = config.networking.networkmanager.enable or false; enableNetworkManager = config.networking.networkmanager.enable or false;
}; };