Skip to content

Commit

Permalink
gvfs: support samba in lightweight version
Browse files Browse the repository at this point in the history
  • Loading branch information
abbradar authored and aristidb committed Oct 25, 2014
1 parent f3d978b commit ca3690d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/development/libraries/gvfs/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool
, glib, dbus, udev, udisks2, libgcrypt
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl
, lightWeight ? true, gnome, samba, libgnome_keyring, gconf, makeWrapper }:
, libxml2, libxslt, docbook_xsl, samba
, lightWeight ? true, gnome,libgnome_keyring, gconf, makeWrapper }:

let
ver_maj = "1.18";
Expand All @@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
buildInputs =
[ makeWrapper glib dbus.libs udev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio
libxml2 libxslt docbook_xsl
libxml2 libxslt docbook_xsl samba
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [
gtk libsoup libgnome_keyring gconf samba
gtk libsoup libgnome_keyring gconf
# ToDo: not working and probably useless until gnome3 from x-updates
]);

Expand Down

6 comments on commit ca3690d

@vcunat
Copy link
Member

@vcunat vcunat commented on ca3690d Feb 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm slightly resentful about this change, as samba by itself takes ~130 MB. That isn't light at all, and it's still the same on closure-size branch.

@vcunat
Copy link
Member

@vcunat vcunat commented on ca3690d Feb 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps there's a good reason for this commit?

@vcunat
Copy link
Member

@vcunat vcunat commented on ca3690d Feb 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made Xfce use gvfs without samba: 9d092e3.

@abbradar
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I can't remember the reason. Also Github hasn't sent me a notification -- I've noticed your comments purely by chance looking at 9d092e3 in the commit log.

@abbradar
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the related discussion: #4625

@vcunat
Copy link
Member

@vcunat vcunat commented on ca3690d Feb 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Perhaps it's worth an option. Most people will never need samba, I think, but some certainly will. The modules should be pluggable even without rebuilding.

Please sign in to comment.