diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-21 11:35:18 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-21 11:43:16 +0100 |
commit | 97f4fa51965705ff34053cef41fd5d5bf28ef619 (patch) | |
tree | 0d480af9622ac1e83f1fca99a4f0685a20f527a4 /pkgs/desktops | |
parent | 9fe72b34edc978c3a034419439f7ac0e110e175d (diff) |
gnome3*.epiphany: fix https when not running gnome-3
This (only) fixes the probem of not finding glib_networking, not any certificate problems. Discussion: #12518.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix index 5ec07d01b2e0b..7dcba4173644f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix index 5a98770b6632c..ff21da4a28c87 100644 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; |