diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-28 17:38:24 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-28 17:40:28 +0100 |
commit | a90974ab450550745fd662f2d5f79b360db6ca15 (patch) | |
tree | c35e81c938120b72843c5f07095c365b2b24634d /pkgs/development | |
parent | 3b19fa97455081f26c675cf001e8decc5f9c14ca (diff) |
gnome3.gvfs: Add TLS support
GLib Gio’s GFile uses gvfs daemon for opening files over HTTP protocol. To support HTTPS, we need to include glib-networking. Closes: https://github.com/NixOS/nixpkgs/issues/52963
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 03f4b0fe687ae..4e407502516d9 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome, makeWrapper +, gnomeSupport ? false, gnome, wrapGAppsHook , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libsecret, libgdata, python3 }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 - pkgconfig gettext makeWrapper + pkgconfig gettext wrapGAppsHook libxml2 libxslt docbook_xsl docbook_xml_dtd_42 ]; @@ -40,6 +40,7 @@ in stdenv.mkDerivation rec { # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ libsoup gcr + glib-networking # TLS support gnome-online-accounts libsecret libgdata ]); @@ -57,14 +58,6 @@ in stdenv.mkDerivation rec { doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" doInstallCheck = doCheck; - preFixup = '' - for f in $out/libexec/*; do - wrapProgram $f \ - ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; |