diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-26 17:25:49 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-26 17:25:49 -0700 |
| commit | ef253212f4978eee85751c43f39adaf22a141d43 (patch) | |
| tree | 6227478d1f264dec8a8562c3d2fbffac409e9dd2 /pkgs/desktops | |
| parent | e130e9d3a3225622194b4edbd9073547d6acb984 (diff) | |
| parent | 8ce4cb4de81fd2b79d8e99e74be4e4a1c481f030 (diff) | |
| download | nixlib-ef253212f4978eee85751c43f39adaf22a141d43.tar nixlib-ef253212f4978eee85751c43f39adaf22a141d43.tar.gz nixlib-ef253212f4978eee85751c43f39adaf22a141d43.tar.bz2 nixlib-ef253212f4978eee85751c43f39adaf22a141d43.tar.lz nixlib-ef253212f4978eee85751c43f39adaf22a141d43.tar.xz nixlib-ef253212f4978eee85751c43f39adaf22a141d43.tar.zst nixlib-ef253212f4978eee85751c43f39adaf22a141d43.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/default.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index e2ec96b5469e..0c676c38efa9 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -2,7 +2,7 @@ , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager +, cracklib, python, libkrb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 7387ee710d0a..cc825f0cc6c5 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -16,6 +16,7 @@ let corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus pkgs.shared_mime_info # for update-mime-database + glib # for gsettings gtk3 # for gtk-update-icon-cache glib_networking gvfs dconf gnome-backgrounds gnome_control_center gnome-menus gnome_settings_daemon gnome_shell |