diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/development/libraries/gvfs | |
parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gvfs')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gvfs/default.nix | 105 |
1 files changed, 81 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 60188d77962b..8b3bc30a6616 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -1,20 +1,49 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome, gcr, wrapGAppsHook -, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata, python3 +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, dbus +, glib +, libgudev +, udisks2 +, libgcrypt +, libcap +, polkit +, libgphoto2 +, avahi +, libarchive +, fuse +, libcdio +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, samba +, libmtp +, gnomeSupport ? false +, gnome3 +, gcr +, glib-networking +, gnome-online-accounts +, wrapGAppsHook +, libimobiledevice +, libbluray +, libcdio-paranoia +, libnfs +, openssh +, libsecret +, libgdata +, python3 }: -let +stdenv.mkDerivation rec { pname = "gvfs"; version = "1.40.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; }; @@ -26,28 +55,56 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - meson ninja python3 - pkgconfig gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + meson + ninja + python3 + pkgconfig + gettext + wrapGAppsHook + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_42 ]; buildInputs = [ - glib libgudev udisks2 libgcrypt dbus - libgphoto2 avahi libarchive fuse libcdio - samba libmtp libcap polkit libimobiledevice libbluray - libcdio-paranoia libnfs openssh - # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup gcr + glib + libgudev + udisks2 + libgcrypt + dbus + libgphoto2 + avahi + libarchive + fuse + libcdio + samba + libmtp + libcap + polkit + libimobiledevice + libbluray + libcdio-paranoia + libnfs + openssh + # TODO: a ligther version of libsoup to have FTP/HTTP support? + ] ++ stdenv.lib.optionals gnomeSupport [ + gnome3.libsoup + gcr glib-networking # TLS support - gnome-online-accounts libsecret libgdata - ]); + gnome-online-accounts + libsecret + libgdata + ]; mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "-Dtmpfilesdir=no" ] ++ stdenv.lib.optionals (!gnomeSupport) [ - "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" + "-Dgcr=false" + "-Dgoa=false" + "-Dkeyring=false" + "-Dhttp=false" "-Dgoogle=false" ] ++ stdenv.lib.optionals (samba == null) [ # Xfce don't want samba |