From 15637cf207bf8fe693e4de1f4c8ee73a6d664898 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 10 Aug 2013 21:00:14 +0400 Subject: [PATCH] Add HTTPS support to Midori --- pkgs/applications/networking/browsers/midori/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index b15c05c7b49..4d561737d27 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -12,6 +12,7 @@ let gtksourceview pkgconfig which gettext makeWrapper file libidn sqlite docutils libnotify libsoup vala kbproto xproto scrnsaverproto libXScrnSaver dbus_glib + glib_networking ]; in rec { @@ -34,7 +35,11 @@ rec { shebangsHere = (doPatchShebangs "."); 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}"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c2e3647816..4c573ceebf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8015,7 +8015,7 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify - vala dbus_glib; + vala dbus_glib glib_networking; inherit gtk3 glib; inherit (gnome) gtksourceview; inherit (webkit.passthru.args) libsoup;