mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge branch 'iconcache'
This commit is contained in:
commit
eb5b7a28c1
@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
|
||||
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 ];
|
||||
|
||||
preFixup = ''
|
||||
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; {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
|
||||
, udev, itstool, libxml2 }:
|
||||
, udev, itstool, libxml2, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-bluetooth-${gnome3.version}.1";
|
||||
@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
|
||||
};
|
||||
|
||||
buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
|
||||
gsettings_desktop_schemas itstool ];
|
||||
buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
|
||||
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; {
|
||||
homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
|
||||
|
Loading…
Reference in New Issue
Block a user