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

gnome3.gvfs: fix build

Browse Source 
Also fix xfce.gvfs
This commit is contained in:
Tor Hedin Brønner 2018-03-15 12:44:34 +01:00 committed by Jan Tojnar
parent d7bf83e2b5
commit d9253589a7
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
, 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
}: }:
let let
@ -37,8 +38,7 @@ stdenv.mkDerivation rec {
# 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 gnome-online-accounts libsecret libgdata
# ToDo: not working and probably useless until gnome3 from x-updates
]); ]);
mesonFlags = [ mesonFlags = [
@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals (!gnomeSupport) [ ] ++ stdenv.lib.optionals (!gnomeSupport) [
"-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
"-Dgoogle=false" "-Dgoogle=false"
] ++ stdenv.lib.optionals (samba == null) [
# Xfce don't want samba
"-Dsmb=false"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;