From 5e14c86b80650575562a81d453fde7f080f82ca1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 17 Nov 2014 15:05:50 +0100
Subject: [PATCH] clutter: update 1.18 -> 1.20. Shouldn't break anything

---
 pkgs/desktops/gnome-3/3.12/default.nix                    | 2 +-
 pkgs/development/libraries/clutter/{1.18.nix => 1.20.nix} | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/clutter/{1.18.nix => 1.20.nix} (89%)

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 85628ff13b24..dfb7a673d5b2 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -3,7 +3,7 @@
 rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
-  clutter = pkgs.clutter_1_18;
+  clutter = pkgs.clutter_1_20;
   clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
   clutter-gst = pkgs.clutter-gst.override { inherit clutter; };
   upower = pkgs.upower_99;
diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.20.nix
similarity index 89%
rename from pkgs/development/libraries/clutter/1.18.nix
rename to pkgs/development/libraries/clutter/1.20.nix
index 7a9d114ce8e3..7afe7568273b 100644
--- a/pkgs/development/libraries/clutter/1.18.nix
+++ b/pkgs/development/libraries/clutter/1.20.nix
@@ -4,15 +4,15 @@ gobjectIntrospection
 }:
 
 let
-  ver_maj = "1.18";
-  ver_min = "2";
+  ver_maj = "1.20";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63";
+    sha256 = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13e068d3dfb6..56163e7d7f3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4926,7 +4926,7 @@ let
 
   clutter = callPackage ../development/libraries/clutter { };
 
-  clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
+  clutter_1_20 = callPackage ../development/libraries/clutter/1.20.nix {
     cogl = cogl_1_18;
   };