summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/3.12/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/gnome-3/3.12/default.nix')
-rw-r--r--pkgs/desktops/gnome-3/3.12/default.nix19
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index ac5427d0e40..dce75eb2176 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -16,6 +16,11 @@ rec {
   orbit = ORBit2;
   inherit (pkgs) libsoup;
 
+  version = "3.12";
+
+# Simplify the nixos module and gnome packages
+  defaultIconTheme = gnome_icon_theme_symbolic;
+
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   baobab = callPackage ./core/baobab { };
@@ -52,6 +57,8 @@ rec {
 
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
+  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
+
   gnome-contacts = callPackage ./core/gnome-contacts { };
 
   gnome_control_center = callPackage ./core/gnome-control-center { };
@@ -158,10 +165,12 @@ rec {
     inherit gnome3;
   };
 
+  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
+    inherit gnome3;
+  };
+
   networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking
-      networkmanager_openvpn networkmanager_pptp networkmanager_vpnc
-      networkmanager_openconnect;
+    inherit gnome3 gsettings_desktop_schemas glib_networking;
   };
 
   rest = callPackage ./core/rest { };
@@ -178,10 +187,6 @@ rec {
 
   vte = callPackage ./core/vte { };
 
-  vte_038 = callPackage ./core/vte/0.38.0.nix { }; # To be moved in gnome 3.14 when available
-
-  vte-select-text = vte_038.override { selectTextPatch = true; };
-
   vino = callPackage ./core/vino { };
 
   yelp = callPackage ./core/yelp {