JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2127 from lethalman/gnome3

Browse Source 
Gnome3 session changes, gnome-control-center icons
This commit is contained in:
Domen Kožar 2014-04-05 00:35:06 +02:00
commit 13bef7f403
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -43,7 +43,8 @@ in {
''; '';
}; };
environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" ]; environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
"${pkgs.glib_networking}/lib/gio/modules" ];
environment.systemPackages = environment.systemPackages =
[ gnome3.evince [ gnome3.evince
gnome3.eog gnome3.eog
@ -54,6 +55,7 @@ in {
gnome3.gucharmap gnome3.gucharmap
gnome3.nautilus gnome3.nautilus
gnome3.yelp gnome3.yelp
pkgs.glib_networking
pkgs.ibus pkgs.ibus
gnome3.gnome_shell gnome3.gnome_shell
gnome3.gnome_settings_daemon gnome3.gnome_settings_daemon

12
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View File

@ -1,7 +1,8 @@
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig , libcanberra, accountservice, libpwquality, pulseaudio, fontconfig
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, libxkbfile , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, 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 }: , 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 # 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"; 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; buildInputs = with gnome3;
[ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
@ -33,7 +38,8 @@ stdenv.mkDerivation rec {
postInstall = with gnome3; '' postInstall = with gnome3; ''
wrapProgram $out/bin/gnome-control-center \ 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 for i in $out/share/applications/*; do
substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
done done