diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-08 15:11:59 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-15 13:04:06 -0400 |
| commit | b0e9f85f47506713eea6b69e14bf67e0929d2a7d (patch) | |
| tree | daafd63ee5c410b9d67b890cec5f758e742b15a0 /nixos | |
| parent | 05a53ecd827c5910e34171e7681c56913b29add1 (diff) | |
| download | nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.tar nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.tar.gz nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.tar.bz2 nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.tar.lz nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.tar.xz nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.tar.zst nixlib-b0e9f85f47506713eea6b69e14bf67e0929d2a7d.zip | |
nixos/glib-networking: init
Note that we were previously didn't have glib-networking in systemd.packages so the PacRunner was non-functional.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/gnome3/glib-networking.nix | 33 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9982cdae9e3d..5c11b55e97f5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -268,6 +268,7 @@ ./services/desktops/gnome3/evince.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/file-roller.nix + ./services/desktops/gnome3/glib-networking.nix ./services/desktops/gnome3/gnome-disks.nix ./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-keyring.nix diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix new file mode 100644 index 000000000000..186668d7d385 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -0,0 +1,33 @@ +# GLib Networking + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.glib-networking = { + + enable = mkEnableOption "network extensions for GLib"; + + }; + + }; + + ###### implementation + + config = mkIf config.services.gnome3.glib-networking.enable { + + services.dbus.packages = [ pkgs.gnome3.glib-networking ]; + + systemd.packages = [ pkgs.gnome3.glib-networking ]; + + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ]; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 121ef07c00dd..3d748d4308b7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -129,6 +129,7 @@ in { services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; services.gnome3.file-roller.enable = mkDefault true; + services.gnome3.glib-networking.enable = true; services.gnome3.gnome-disks.enable = mkDefault true; services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; @@ -205,7 +206,6 @@ in { services.xserver.updateDbusEnvironment = true; environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ |