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

gvfs: only support GNOME 3, not GNOME 2

Browse Source 
It will make the expression and calls nicer.
This commit is contained in:
Jan Tojnar 2019-09-02 13:00:22 +02:00
parent 8605b470ba
commit ef19440dc5
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
gvfs = pkgs.gvfs.override { gnomeSupport = true; };
eog = callPackage ./core/eog { };

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

@ -1,8 +1,8 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, dbus
, glib, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, gcr, wrapGAppsHook
, gnomeSupport ? false, gnome3, gcr, wrapGAppsHook
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata, python3
}:
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
samba libmtp libcap polkit libimobiledevice libbluray
libcdio-paranoia libnfs openssh
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [
libsoup gcr
glib-networking # TLS support
gnome-online-accounts libsecret libgdata

4
pkgs/top-level/all-packages.nix
View File

@ -11265,9 +11265,7 @@ in
gumbo = callPackage ../development/libraries/gumbo { };
gvfs = callPackage ../development/libraries/gvfs {
gnome = res.gnome3;
};
gvfs = callPackage ../development/libraries/gvfs { };
gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };