From aa0fa193734a0bb9c1ee156317008d7409647bdf Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 13 Sep 2016 23:51:25 +0200
Subject: gtk2: move gtk-update-icon-cache to gtk2.out

... to be useful for regeneration when building nixos environments.
Fixes #18536 (hopefully).
---
 pkgs/development/libraries/gtk+/2.x.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/development/libraries/gtk+')

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index df645f109613..91407e556c05 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     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 = {
-- 
cgit 1.4.1


From 7871ca4024d24eaac35030dd642a69b76bfaf302 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Sun, 18 Sep 2016 21:32:28 +0200
Subject: gtk+3: 3.20.9 -> 3.22.0

---
 pkgs/development/libraries/gtk+/3.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development/libraries/gtk+')

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 1ac006b21617..c4b5c56c341f 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -12,8 +12,8 @@ assert cupsSupport -> cups != null;
 with stdenv.lib;
 
 let
-  ver_maj = "3.20";
-  ver_min = "9";
+  ver_maj = "3.22";
+  ver_min = "0";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3";
+    sha256 = "0d21qx0j7awm69jlfx7z7vqddbqarylqifl2bfbfrv779dcbpl48";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 66727f891946bec14a00ebb196e512cb51162cb5 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Sat, 1 Oct 2016 11:24:23 +0200
Subject: gtk+3: 3.22.0 -> 3.22.1

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries/gtk+')

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index c4b5c56c341f..7b58f4cad427 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "0";
+  ver_min = "1";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "0d21qx0j7awm69jlfx7z7vqddbqarylqifl2bfbfrv779dcbpl48";
+    sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1