summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-08-18 11:36:32 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-08-18 11:36:32 -0700
commit2ac70270e87f19194440044a456a520341ec5dbc (patch)
tree69870efcecb0eca5653978dded78cb571e77c157 /pkgs/desktops
parent5ec252e7ca23e1248d90a00863b042ae8daa9bfa (diff)
parent31a27c44c8b2e6321f0ac4534c035d62faca8211 (diff)
downloadnixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar
nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.gz
nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.bz2
nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.lz
nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.xz
nixlib-2ac70270e87f19194440044a456a520341ec5dbc.tar.zst
nixlib-2ac70270e87f19194440044a456a520341ec5dbc.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.nix8
1 files changed, 5 insertions, 3 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 84bdb7492bb0..edd35202314a 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
@@ -1,10 +1,11 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
+, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
+, fontconfig, sound-theme-freedesktop }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
 # TODO: bluetooth, wacom, printers
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+  propagatedUserEnvPkgs =
+    [ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ];
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=752596
   enableParallelBuilding = false;