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

Merge branch 'iconcache'

Browse Source
This commit is contained in:
Luca Bruno 2015-06-13 15:27:59 +02:00
commit eb5b7a28c1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
View File

@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88"; sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
}; };
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/dconf-editor" \ wrapProgram "$out/bin/dconf-editor" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

11
pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib { stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
, udev, itstool, libxml2 }: , udev, itstool, libxml2, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-bluetooth-${gnome3.version}.1"; name = "gnome-bluetooth-${gnome3.version}.1";
@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz"; sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
}; };
buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
gsettings_desktop_schemas itstool ]; makeWrapper gsettings_desktop_schemas itstool ];
preFixup = ''
wrapProgram "$out/bin/bluetooth-sendto" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;