From 31d77b3e2f4125d40e3819f1a4d2a882d3fc5985 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Sep 2011 06:23:27 +0000
Subject: [PATCH] gtkmm-2.24

svn path=/nixpkgs/trunk/; revision=29388
---
 .../libraries/gtkmm/{2.18.x.nix => 2.24.x.nix}   | 16 +++++++++-------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)
 rename pkgs/development/libraries/gtkmm/{2.18.x.nix => 2.24.x.nix} (65%)

diff --git a/pkgs/development/libraries/gtkmm/2.18.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix
similarity index 65%
rename from pkgs/development/libraries/gtkmm/2.18.x.nix
rename to pkgs/development/libraries/gtkmm/2.24.x.nix
index 63644a17360..89e12bc4c1c 100644
--- a/pkgs/development/libraries/gtkmm/2.18.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.24.x.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }:
+{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm, xz }:
 
 stdenv.mkDerivation rec {
-  name = "gtkmm-2.18.2";
+  name = src.pkgname;
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/2.18/${name}.tar.bz2";
-    sha256 = "0kj71db6qwgybmrs0myaz6hfz1zdfzh286vkmv5ldh6d5vi07h6z";
+  src = fetchurl_gnome {
+    project = "gtkmm";
+    major = "2"; minor = "24"; patchlevel = "2"; extension = "xz";
+    sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369";
   };
 
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ];
+  buildNativeInputs = [pkgconfig xz];
+
+  propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ];
 
   meta = {
     description = "C++ interface to the GTK+ graphical user interface library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b40d9ef5269..11899a7efe6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3558,7 +3558,7 @@ let
 
     gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { };
 
-    gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { };
+    gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
 
     gob2 = callPackage ../development/tools/misc/gob2 { };