From 42aa2e25ec3e2a233fb2f29d053e05f8ea70e0c4 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 25 Oct 2014 16:17:39 +0200
Subject: [PATCH] gvfs: lightWeight -> !gnomeSupport

---
 pkgs/desktops/gnome-3/3.10/default.nix      | 2 +-
 pkgs/desktops/gnome-3/3.12/default.nix      | 2 +-
 pkgs/development/libraries/gvfs/default.nix | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix
index ad23f7a759f1..ceece3957332 100644
--- a/pkgs/desktops/gnome-3/3.10/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/default.nix
@@ -102,7 +102,7 @@ rec {
 
   gucharmap = callPackage ./core/gucharmap { };
 
-  gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; lightWeight = false; };
+  gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; gnomeSupport = true; };
 
   eog = callPackage ./core/eog { };
 
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index f223c8c0a96d..cff592cd063e 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -112,7 +112,7 @@ rec {
 
   gucharmap = callPackage ./core/gucharmap { };
 
-  gvfs = pkgs.gvfs.override { gnome = gnome3; lightWeight = false; };
+  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
 
   eog = callPackage ./core/eog { };
 
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index ca947e8dd81c..0cd8e19cee92 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -2,7 +2,7 @@
 , glib, dbus, udev, udisks2, libgcrypt
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, samba
-, lightWeight ? true, gnome,libgnome_keyring, gconf, makeWrapper }:
+, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }:
 
 let
   ver_maj = "1.18";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       libgphoto2 avahi libarchive fuse libcdio
       libxml2 libxslt docbook_xsl samba
       # ToDo: a ligther version of libsoup to have FTP/HTTP support?
-    ] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [
+    ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
       gtk libsoup libgnome_keyring gconf
       # ToDo: not working and probably useless until gnome3 from x-updates
     ]);
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)";
+    description = "Virtual Filesystem support library" + stdenv.lib.optionalString gnomeSupport " (full GNOME support)";
     platforms = stdenv.lib.platforms.linux;
   };
 }