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

gvfs: fix build

Browse Source
This commit is contained in:
Tor Hedin Brønner 2018-03-14 21:48:56 +01:00 committed by Jan Tojnar
parent 6c66e9dd3c
commit 174a82141c
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,10 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool, gnome3 { stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3
, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit , glib, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma , 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
}:
let let
pname = "gvfs"; pname = "gvfs";
@ -16,22 +18,38 @@ stdenv.mkDerivation rec {
sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy"; sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy";
}; };
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig intltool libtool file makeWrapper meson ninja
pkgconfig gettext makeWrapper
libxml2 libxslt docbook_xsl docbook_xml_dtd_42 libxml2 libxslt docbook_xsl docbook_xml_dtd_42
]; ];
buildInputs = buildInputs =
[ glib dbus udev libgudev udisks2 libgcrypt [ glib libgudev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio lzma bzip2 libgphoto2 avahi libarchive fuse libcdio
samba libmtp libcap polkit samba libmtp libcap polkit libimobiledevice libbluray
libcdio-paranoia libnfs openssh
# 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 libgnome-keyring gconf gcr libsoup gcr
gnome-online-accounts
# ToDo: not working and probably useless until gnome3 from x-updates # ToDo: not working and probably useless until gnome3 from x-updates
]); ]);
configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr"; 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"
];
enableParallelBuilding = true; enableParallelBuilding = true;