xfce: does not explicitly require a gvfs package
- In order to use GIO/GVFS it is enough to enable the gvfs service. - The module option services.gvfs.package can be used to choose a variation of the gvfs package, if desired.
This commit is contained in:
parent
6dab4db428
commit
472f5a976d
@ -151,7 +151,6 @@ in
|
|||||||
services.upower.enable = config.powerManagement.enable;
|
services.upower.enable = config.powerManagement.enable;
|
||||||
services.gnome3.glib-networking.enable = true;
|
services.gnome3.glib-networking.enable = true;
|
||||||
services.gvfs.enable = true;
|
services.gvfs.enable = true;
|
||||||
services.gvfs.package = pkgs.xfce.gvfs;
|
|
||||||
services.tumbler.enable = true;
|
services.tumbler.enable = true;
|
||||||
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
|
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
|
||||||
services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
|
services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, mkXfceDerivation, gtk3, gvfs, glib }:
|
{ lib, mkXfceDerivation, gtk3, glib }:
|
||||||
|
|
||||||
mkXfceDerivation {
|
mkXfceDerivation {
|
||||||
category = "apps";
|
category = "apps";
|
||||||
@ -8,7 +8,7 @@ mkXfceDerivation {
|
|||||||
|
|
||||||
sha256 = "8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY=";
|
sha256 = "8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY=";
|
||||||
|
|
||||||
buildInputs = [ gtk3 glib gvfs ];
|
buildInputs = [ gtk3 glib ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# exo-csource has been dropped from exo
|
# exo-csource has been dropped from exo
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
, libxslt
|
, libxslt
|
||||||
, xfconf
|
, xfconf
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gvfs
|
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, symlinkJoin
|
, symlinkJoin
|
||||||
, thunarPlugins ? []
|
, thunarPlugins ? []
|
||||||
@ -35,7 +34,6 @@ let unwrapped = mkXfceDerivation {
|
|||||||
exo
|
exo
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
gtk3
|
gtk3
|
||||||
gvfs
|
|
||||||
libX11
|
libX11
|
||||||
libgudev
|
libgudev
|
||||||
libnotify
|
libnotify
|
||||||
|
@ -15,9 +15,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
|
|
||||||
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
|
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
|
||||||
|
|
||||||
# Samba is a rather heavy dependency
|
|
||||||
gvfs = pkgs.gvfs.override { samba = null; };
|
|
||||||
|
|
||||||
#### CORE
|
#### CORE
|
||||||
|
|
||||||
exo = callPackage ./core/exo { };
|
exo = callPackage ./core/exo { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user