public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53016 from jtojnar/gvfs-tls

Browse Source 
gnome3.gvfs: Add TLS support
This commit is contained in:
Jan Tojnar 2018-12-29 13:16:16 +01:00 committed by GitHub
commit 484785c9e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/gvfs/default.nix
View File

@ -2,7 +2,7 @@
, glib, libgudev, udisks2, libgcrypt, libcap, polkit , glib, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio , libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper , gnomeSupport ? false, gnome, wrapGAppsHook
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata, python3 , libsecret, libgdata, python3
}: }:
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja python3 meson ninja python3
pkgconfig gettext makeWrapper pkgconfig gettext wrapGAppsHook
libxml2 libxslt docbook_xsl docbook_xml_dtd_42 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? # ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
libsoup gcr libsoup gcr
glib-networking # TLS support
gnome-online-accounts libsecret libgdata gnome-online-accounts libsecret libgdata
]); ]);
@ -57,14 +58,6 @@ in stdenv.mkDerivation rec {
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
doInstallCheck = doCheck; 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 = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;