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

gvfs: lightWeight -> !gnomeSupport

Browse Source
This commit is contained in:
Aristid Breitkreuz 2014-10-25 16:17:39 +02:00
parent ca3690d426
commit 42aa2e25ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/3.10/default.nix
View File

@ -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 { };

2
pkgs/desktops/gnome-3/3.12/default.nix
View File

@ -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 { };

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

@ -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;
};
}