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

Merge pull request #38392 from hedning/gvfs-fix 

gvfs: fix non-deterministic build failure
This commit is contained in:
Jan Tojnar 2018-04-03 18:03:54 +02:00 committed by GitHub
parent 729cd0352d ebda67e15f
commit 817c086642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 , gnomeSupport ? false, gnome, makeWrapper
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata , 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 let
pname = "gvfs"; pname = "gvfs";
version = "1.36.0"; version = "1.36.0";
@ -19,13 +28,15 @@ stdenv.mkDerivation rec {
sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy"; sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy";
}; };
postPatch = '' # Uncomment when switching back to meson
chmod +x meson_post_install.py # patchShebangs requires executable file # postPatch = ''
patchShebangs meson_post_install.py # chmod +x meson_post_install.py # patchShebangs requires executable file
''; # patchShebangs meson_post_install.py
# '';
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja autoreconfHook # Remove when switching to meson
# meson ninja
pkgconfig gettext makeWrapper pkgconfig gettext makeWrapper
libxml2 libxslt docbook_xsl docbook_xml_dtd_42 libxml2 libxslt docbook_xsl docbook_xml_dtd_42
]; ];
@ -35,24 +46,30 @@ stdenv.mkDerivation rec {
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
lzma bzip2
# 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 gcr libsoup gcr
gnome-online-accounts libsecret libgdata gnome-online-accounts libsecret libgdata
]); ]);
mesonFlags = [ # Remove when switching back to meson
"-Dgio_module_dir=lib/gio/modules" configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
"-Dsystemduserunitdir=lib/systemd/user"
"-Ddbus_service_dir=share/dbus-1/services" # Uncomment when switching back to meson
"-Dtmpfilesdir=no" # mesonFlags = [
] ++ stdenv.lib.optionals (!gnomeSupport) [ # "-Dgio_module_dir=lib/gio/modules"
"-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" # "-Dsystemduserunitdir=lib/systemd/user"
"-Dgoogle=false" # "-Ddbus_service_dir=share/dbus-1/services"
] ++ stdenv.lib.optionals (samba == null) [ # "-Dtmpfilesdir=no"
# Xfce don't want samba # ] ++ stdenv.lib.optionals (!gnomeSupport) [
"-Dsmb=false" # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
]; # "-Dgoogle=false"
# ] ++ stdenv.lib.optionals (samba == null) [
# # Xfce don't want samba
# "-Dsmb=false"
# ];
enableParallelBuilding = true; enableParallelBuilding = true;