diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-22 22:55:39 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-22 22:57:52 +0100 |
| commit | df67f58fbfde8bfe5f1e6659c18b0953558cd534 (patch) | |
| tree | ab8051a08877b5549b80253c8ce4e82c86dd0470 /pkgs | |
| parent | b1e9acfb18fdb719c900d247012527a51b3e4055 (diff) | |
| download | nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.tar nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.tar.gz nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.tar.bz2 nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.tar.lz nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.tar.xz nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.tar.zst nixpkgs-df67f58fbfde8bfe5f1e6659c18b0953558cd534.zip | |
gtk3: move gtk-update-icon-cache to the main output
This is basically what aa0fa193734a was for gtk2 and Xfce. Fixes #20874, though I haven't tested it directly.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 3b76ac80fdb..b5e19e5a1b5 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -20,7 +20,7 @@ let pkgs.desktop_file_utils pkgs.ibus pkgs.shared_mime_info # for update-mime-database glib # for gsettings - gtk3 # for gtk-update-icon-cache + gtk3.out # for gtk-update-icon-cache glib_networking gvfs dconf gnome-backgrounds gnome_control_center gnome-menus gnome_settings_daemon gnome_shell gnome_themes_standard defaultIconTheme gnome-shell-extensions diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 64f5a1e3bdd..45c21df4696 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation rec { postInstall = optionalString (!stdenv.isDarwin) '' substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \ --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk-update-icon-cache "$out" ''; meta = with stdenv.lib; { |