diff options
| author | Bryan Gardiner <bog@khumba.net> | 2015-10-20 22:23:01 -0700 |
|---|---|---|
| committer | Bryan Gardiner <bog@khumba.net> | 2015-11-16 20:23:12 -0800 |
| commit | f2afad2349d1edc6047729fd824789a51f5bf45d (patch) | |
| tree | 6b0f733138ed77c2f2e672858e78911ba56854e6 /pkgs | |
| parent | 0ff2240da3856c37bf04439f032a0e789507776b (diff) | |
| download | nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.tar nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.tar.gz nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.tar.bz2 nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.tar.lz nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.tar.xz nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.tar.zst nixpkgs-f2afad2349d1edc6047729fd824789a51f5bf45d.zip | |
claws-mail: add glib_networking for fancy to load HTTPS content (#10421)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/claws-mail/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index b29165fde97..2c3b502e3c3 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,8 @@ -{ fetchurl, stdenv +{ fetchurl, stdenv, wrapGAppsHook , curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme , libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 +, glib_networking, gsettings_desktop_schemas # Build options # TODO: A flag to build the manual. @@ -55,8 +56,8 @@ stdenv.mkDerivation { ''; buildInputs = - [ curl dbus dbus_glib gtk gnutls hicolor_icon_theme - libetpan perl pkgconfig python + [ curl dbus dbus_glib gtk gnutls gsettings_desktop_schemas hicolor_icon_theme + libetpan perl pkgconfig python wrapGAppsHook ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] @@ -91,6 +92,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; + wrapPrefixVariables = [ "GIO_EXTRA_MODULES" ]; + GIO_EXTRA_MODULES = "${glib_networking}/lib/gio/modules"; + postInstall = '' mkdir -p $out/share/applications cp claws-mail.desktop $out/share/applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f88db9101d4..1ec098c704c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11121,6 +11121,7 @@ let cinelerra = callPackage ../applications/video/cinelerra { }; clawsMail = callPackage ../applications/networking/mailreaders/claws-mail { + inherit (gnome3) gsettings_desktop_schemas; enableNetworkManager = config.networking.networkmanager.enable or false; }; |