suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

gtk2: move gtk-update-icon-cache to gtk2.out

Browse Source 
... to be useful for regeneration when building nixos environments.
Fixes #18536 (hopefully).
This commit is contained in:
Vladimír Čunát 2016-09-13 23:51:25 +02:00
parent e0974c8948
commit aa0fa19373
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -69,7 +69,7 @@ in
services.xserver.updateDbusEnvironment = true; services.xserver.updateDbusEnvironment = true;
environment.systemPackages = environment.systemPackages =
[ pkgs.gtk # To get GTK+'s themes. [ pkgs.gtk.out # To get GTK+'s themes and gtk-update-icon-cache
pkgs.hicolor_icon_theme pkgs.hicolor_icon_theme
pkgs.tango-icon-theme pkgs.tango-icon-theme
pkgs.shared_mime_info pkgs.shared_mime_info

2
pkgs/data/icons/tango-icon-theme/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-png-creation"; configureFlags = "--enable-png-creation";
postInstall = '''${gtk.dev}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
meta = { meta = {
description = "A basic set of icons"; description = "A basic set of icons";

2
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
moveToOutput share/gtk-2.0/demo "$devdoc" moveToOutput share/gtk-2.0/demo "$devdoc"
# The updater is needed for nixos env and it's tiny.
moveToOutput bin/gtk-update-icon-cache "$out"
''; '';
passthru = { passthru = {