Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gnome3.gvfs: Add TLS support #53016

Merged
merged 1 commit into from Dec 29, 2018
Merged

gnome3.gvfs: Add TLS support #53016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 3 additions & 10 deletions pkgs/development/libraries/gvfs/default.nix
View file
Open in desktop
Expand Up @@ -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
}:
Expand All @@ -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
];

Expand All @@ -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
]);

Expand All @@ -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;
Expand Down