summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorHerwig Hochleitner <herwig@bendlas.net>2015-04-28 02:35:43 +0200
committerHerwig Hochleitner <herwig@bendlas.net>2015-04-28 02:54:14 +0200
commitc600f5af25dbe95c1457e5bc4322ab284d4417cf (patch)
tree5588453aa222a0ed512b0ae01e96645a16b68535 /nixos
parent6a366d535a6cbb6f524063da3b3134b6cf3d7093 (diff)
downloadnixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.tar
nixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.tar.gz
nixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.tar.bz2
nixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.tar.lz
nixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.tar.xz
nixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.tar.zst
nixpkgs-c600f5af25dbe95c1457e5bc4322ab284d4417cf.zip
gnome3: move definition of package sets into pkgs
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix49
1 files changed, 2 insertions, 47 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c951f3eae77..d53f119c955 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -132,53 +132,8 @@ in {
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
                                                 "${gnome3.glib_networking}/lib/gio/modules"
                                                 "${gnome3.gvfs}/lib/gio/modules" ];
-    environment.systemPackages =
-      [ pkgs.desktop_file_utils
-        gnome3.glib_networking
-        gnome3.gtk3 # for gtk-update-icon-cache
-        pkgs.ibus
-        pkgs.shared_mime_info # for update-mime-database
-        gnome3.gvfs
-        gnome3.dconf
-        gnome3.gnome-backgrounds
-        gnome3.gnome_control_center
-        gnome3.gnome-menus
-        gnome3.gnome_settings_daemon
-        gnome3.gnome_shell
-        gnome3.gnome_themes_standard
-        gnome3.defaultIconTheme
-      ] ++ cfg.sessionPath ++ (removePackagesByName [
-        gnome3.baobab
-        gnome3.empathy
-        gnome3.eog
-        gnome3.epiphany
-        gnome3.evince
-        gnome3.gucharmap
-        gnome3.nautilus
-        gnome3.totem
-        gnome3.vino
-        gnome3.yelp
-        gnome3.gnome-bluetooth
-        gnome3.gnome-calculator
-        gnome3.gnome-contacts
-        gnome3.gnome-font-viewer
-        gnome3.gnome-screenshot
-        gnome3.gnome-shell-extensions
-        gnome3.gnome-system-log
-        gnome3.gnome-system-monitor
-        gnome3.gnome_terminal
-        gnome3.gnome-user-docs
-
-        gnome3.bijiben
-        gnome3.evolution
-        gnome3.file-roller
-        gnome3.gedit
-        gnome3.gnome-clocks
-        gnome3.gnome-music
-        gnome3.gnome-tweak-tool
-        gnome3.gnome-photos
-        gnome3.nautilus-sendto
-      ] config.environment.gnome3.excludePackages);
+    environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
+      ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
 
     # Use the correct gnome3 packageSet
     networking.networkmanager.basePackages =