diff options
| author | Domen Kožar <domen@dev.si> | 2014-04-05 00:35:06 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-04-05 00:35:06 +0200 |
| commit | 13bef7f4034dd8f81542151c770fc22376244e90 (patch) | |
| tree | 55febffdb8195ec026f0a43b9a31132d07f5e6e1 /pkgs/desktops/gnome-3 | |
| parent | 6df2b09015fc6f107ee20d0f75375266efc72fd3 (diff) | |
| parent | 750d5e4a83ef1d99ec8f9f2b302364ed27726588 (diff) | |
| download | nixlib-13bef7f4034dd8f81542151c770fc22376244e90.tar nixlib-13bef7f4034dd8f81542151c770fc22376244e90.tar.gz nixlib-13bef7f4034dd8f81542151c770fc22376244e90.tar.bz2 nixlib-13bef7f4034dd8f81542151c770fc22376244e90.tar.lz nixlib-13bef7f4034dd8f81542151c770fc22376244e90.tar.xz nixlib-13bef7f4034dd8f81542151c770fc22376244e90.tar.zst nixlib-13bef7f4034dd8f81542151c770fc22376244e90.zip | |
Merge pull request #2127 from lethalman/gnome3
Gnome3 session changes, gnome-control-center icons
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 6b8f427d4107..ac9c53422b32 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper , libcanberra, accountservice, libpwquality, pulseaudio, fontconfig -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, libxkbfile -, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify +, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify +, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk +, cracklib, python, krb5, networkmanagerapplet, libwacom, samba , shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns }: # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules @@ -15,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn"; }; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + buildInputs = with gnome3; [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus @@ -33,7 +38,8 @@ stdenv.mkDerivation rec { postInstall = with gnome3; '' wrapProgram $out/bin/gnome-control-center \ - --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gsettings_desktop_schemas}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS" for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done |