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

gvfs: fix non-deterministic build failure

Browse Source
This commit is contained in:
Tor Hedin Brønner 2018-04-02 11:10:40 +02:00
parent 38d0e1ddf5
commit ebda67e15f
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,17 @@
, gnomeSupport ? false, gnome, makeWrapper
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata
# 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
pname = "gvfs";
version = "1.36.0";
@ -19,13 +28,15 @@ stdenv.mkDerivation rec {
sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy";
};
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
# Uncomment when switching back to meson
# postPatch = ''
# chmod +x meson_post_install.py # patchShebangs requires executable file
# patchShebangs meson_post_install.py
# '';
nativeBuildInputs = [
meson ninja
autoreconfHook # Remove when switching to meson
# meson ninja
pkgconfig gettext makeWrapper
libxml2 libxslt docbook_xsl docbook_xml_dtd_42
];
@ -35,24 +46,30 @@ stdenv.mkDerivation rec {
libgphoto2 avahi libarchive fuse libcdio
samba libmtp libcap polkit libimobiledevice libbluray
libcdio-paranoia libnfs openssh
# Remove when switching back to meson
lzma bzip2
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
libsoup gcr
gnome-online-accounts libsecret libgdata
]);
mesonFlags = [
"-Dgio_module_dir=lib/gio/modules"
"-Dsystemduserunitdir=lib/systemd/user"
"-Ddbus_service_dir=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"
];
# Remove when switching back to meson
configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
# Uncomment when switching back to meson
# mesonFlags = [
# "-Dgio_module_dir=lib/gio/modules"
# "-Dsystemduserunitdir=lib/systemd/user"
# "-Ddbus_service_dir=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;