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

gvfs: 1.36.2 → 1.38.1

Browse Source
This commit is contained in:
Jan Tojnar 2018-09-05 00:50:01 +00:00
parent cb45ce9017
commit 1852c62c67
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 29 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,83 +1,59 @@
{ stdenv, fetchurl, pkgconfig, gettext, gnome3 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
, 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, makeWrapper
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata, python3 , libsecret, libgdata, python3
# Remove when switching back to meson
, autoreconfHook, lzma, bzip2
}: }:
# TODO: switch to meson when upstream fixes a non-deterministic build failure
# See https://bugzilla.gnome.org/show_bug.cgi?id=794549
# Meson specific things are commented out and annotated, so switching back
# should simply require deleting autotools specific things and adding back meson
# flags etc.
let let
pname = "gvfs"; pname = "gvfs";
version = "1.36.2"; version = "1.38.1";
in in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { 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}/${name}.tar.xz";
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"; sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd";
}; };
postPatch = '' postPatch = ''
# patchShebangs requires executable file
chmod +x codegen.py meson_post_install.py
patchShebangs meson_post_install.py
patchShebangs codegen.py
patchShebangs test test-driver patchShebangs test test-driver
''; '';
# Uncomment when switching back to meson
# postPatch = ''
# chmod +x meson_post_install.py # patchShebangs requires executable file
# patchShebangs meson_post_install.py
# '';
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook # Remove when switching to meson meson ninja python3
# meson ninja
pkgconfig gettext makeWrapper pkgconfig gettext makeWrapper
libxml2 libxslt docbook_xsl docbook_xml_dtd_42 libxml2 libxslt docbook_xsl docbook_xml_dtd_42
]; ];
buildInputs = buildInputs = [
[ glib libgudev udisks2 libgcrypt glib libgudev udisks2 libgcrypt dbus
libgphoto2 avahi libarchive fuse libcdio libgphoto2 avahi libarchive fuse libcdio
samba libmtp libcap polkit libimobiledevice libbluray samba libmtp libcap polkit libimobiledevice libbluray
libcdio-paranoia libnfs openssh libcdio-paranoia libnfs openssh
# Remove when switching back to meson # ToDo: a ligther version of libsoup to have FTP/HTTP support?
lzma bzip2 ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
# ToDo: a ligther version of libsoup to have FTP/HTTP support? libsoup gcr
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ gnome-online-accounts libsecret libgdata
libsoup gcr ]);
gnome-online-accounts libsecret libgdata
]);
# Remove when switching back to meson mesonFlags = [
configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr"; "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
"-Dtmpfilesdir=no"
] ++ stdenv.lib.optionals (!gnomeSupport) [
"-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
"-Dgoogle=false"
] ++ stdenv.lib.optionals (samba == null) [
# Xfce don't want samba
"-Dsmb=false"
];
# Uncomment when switching back to meson
# mesonFlags = [
# "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
# "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
# "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
# "-Dtmpfilesdir=no"
# ] ++ stdenv.lib.optionals (!gnomeSupport) [
# "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
# "-Dgoogle=false"
# ] ++ stdenv.lib.optionals (samba == null) [
# # Xfce don't want samba
# "-Dsmb=false"
# ];
enableParallelBuilding = true;
checkInputs = [ python3 ];
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
doInstallCheck = doCheck; doInstallCheck = doCheck;