From 52787275a428e7eb59d31d144120766f775d7c9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 12 Feb 2011 13:52:17 +0000
Subject: [PATCH] * Update clutter and clutter-gtk to get it to build with the
latest GTK+ (http://hydra.nixos.org/build/902751).
svn path=/nixpkgs/branches/x-updates/; revision=25920
---
pkgs/development/libraries/clutter-gtk/default.nix | 6 ++++--
pkgs/development/libraries/clutter/default.nix | 5 ++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index d2b123fade3d..666c709f7de1 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,17 +1,19 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk }:
stdenv.mkDerivation rec {
- name = "clutter-gtk-0.10.4";
+ name = "clutter-gtk-0.10.8";
src = fetchurl {
url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
- sha256 = "04mrq5ddj24zhh7dvyp9bl8510wq7qpmy3rl3wiqwl9c43gahd01";
+ sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
};
buildInputs = [ pkgconfig clutter gtk ];
preConfigure = "export V=1";
+ postBuild = "rm -rf $out/share/gtk-doc";
+
meta = {
description = "Clutter-GTK";
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 205a9020511d..58fd70165d99 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -2,11 +2,11 @@
, libXcomposite, cairo, glib, pango, gtk, json_glib }:
stdenv.mkDerivation rec {
- name = "clutter-1.4.0";
+ name = "clutter-1.4.2";
src = fetchurl {
url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2";
- sha256 = "15icq2gf2fi098lq1wqr7sq2cnb00g1ids050a5z3f43l1ajrnxw";
+ sha256 = "14l8wgk5jdwsnjf991qgzl115kjs1xywil2awlrwj1airsn6gzcj";
};
buildInputs = [ pkgconfig ];
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
libXi libXfixes libXdamage libXcomposite
];
-
meta = {
description = "Clutter, a library for creating fast, dynamic graphical user interfaces";