Add HTTPS support to Midori

This commit is contained in:
Michael Raskin 2013-08-10 21:00:14 +04:00
parent 70ea99cfa8
commit 15637cf207
2 changed files with 7 additions and 2 deletions

View file

@ -12,6 +12,7 @@ let
gtksourceview pkgconfig which gettext makeWrapper gtksourceview pkgconfig which gettext makeWrapper
file libidn sqlite docutils libnotify libsoup vala file libidn sqlite docutils libnotify libsoup vala
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
glib_networking
]; ];
in in
rec { rec {
@ -34,7 +35,11 @@ rec {
shebangsHere = (doPatchShebangs "."); shebangsHere = (doPatchShebangs ".");
shebangsInstalled = (doPatchShebangs "$out/bin"); shebangsInstalled = (doPatchShebangs "$out/bin");
wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1"); wrapWK = (makeManyWrappers "$out/bin/*"
''
--set WEBKIT_IGNORE_SSL_ERRORS 1 \
--prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules"
'');
name = "midori-${version}.${release}"; name = "midori-${version}.${release}";
meta = { meta = {

View file

@ -8015,7 +8015,7 @@ let
midori = builderDefsPackage (import ../applications/networking/browsers/midori) { midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
inherit imagemagick intltool python pkgconfig webkit libxml2 inherit imagemagick intltool python pkgconfig webkit libxml2
which gettext makeWrapper file libidn sqlite docutils libnotify which gettext makeWrapper file libidn sqlite docutils libnotify
vala dbus_glib; vala dbus_glib glib_networking;
inherit gtk3 glib; inherit gtk3 glib;
inherit (gnome) gtksourceview; inherit (gnome) gtksourceview;
inherit (webkit.passthru.args) libsoup; inherit (webkit.passthru.args) libsoup;