git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #53016 from jtojnar/gvfs-tls

gnome3.gvfs: Add TLS support

commit484785c9e3d9645ab1c9b0bef36da54221fea031 authorJan Tojnar <jtojnar@gmail.com> dateSat 29 Dec 2018, 13:16 (8 years ago) parentde1be9fa90974a
1 file changed+3−10
pkgs/development/libraries/gvfs/default.nix+3−10
pkgs/development/libraries/gvfs/default.nix+3−10
@@ -2,7 +2,7 @@
22, glib, libgudev, udisks2, libgcrypt, libcap, polkit
33, libgphoto2, avahi, libarchive, fuse, libcdio
44, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
5−, gnomeSupport ? false, gnome, makeWrapper
5+, gnomeSupport ? false, gnome, wrapGAppsHook
66, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
77, libsecret, libgdata, python3
88}:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
2828
2929 nativeBuildInputs = [
3030 meson ninja python3
31− pkgconfig gettext makeWrapper
31+ pkgconfig gettext wrapGAppsHook
3232 libxml2 libxslt docbook_xsl docbook_xml_dtd_42
3333 ];
3434
@@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
4040 # ToDo: a ligther version of libsoup to have FTP/HTTP support?
4141 ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
4242 libsoup gcr
43+ glib-networking # TLS support
4344 gnome-online-accounts libsecret libgdata
4445 ]);
4546
@@ -57,14 +58,6 @@ in stdenv.mkDerivation rec {
5758 doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
5859 doInstallCheck = doCheck;
5960
60− preFixup = ''
61− for f in $out/libexec/*; do
62− wrapProgram $f \
63− ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \
64− --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
65− done
66− '';
67−
6861 passthru = {
6962 updateScript = gnome3.updateScript {
7063 packageName = pname;