diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-03-15 12:44:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:56 +0100 |
| commit | d9253589a7f7952ee5924feb32c3d7bb88a656e4 (patch) | |
| tree | 93d071fd5e5b707ad937439cd4933076d61b44e1 /pkgs | |
| parent | d7bf83e2b5bbf23ecb81098da288ab93a26618f2 (diff) | |
| download | nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.tar nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.tar.gz nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.tar.bz2 nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.tar.lz nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.tar.xz nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.tar.zst nixpkgs-d9253589a7f7952ee5924feb32c3d7bb88a656e4.zip | |
gnome3.gvfs: fix build
Also fix xfce.gvfs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index e6f1ba8df56..b0b2d21e2bd 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -4,6 +4,7 @@ , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh +, libsecret, libgdata }: let @@ -37,8 +38,7 @@ stdenv.mkDerivation rec { # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ libsoup gcr - gnome-online-accounts - # ToDo: not working and probably useless until gnome3 from x-updates + gnome-online-accounts libsecret libgdata ]); mesonFlags = [ @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { ] ++ 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; |