From bdafe406db80575280f1c377db8a28ee09729452 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Feb 2011 17:27:16 +0000
Subject: [PATCH] * Update gobject-introspection.
svn path=/nixpkgs/branches/x-updates/; revision=25910
---
.../libraries/gobject-introspection/default.nix | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f5fed1e16049..96629b251978 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }:
+{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }:
let
baseName = "gobject-introspection";
- v = "0.6.10";
+ v = "0.10.2";
in
stdenv.mkDerivation rec {
name = "${baseName}-${v}";
- buildInputs = [ flex bison glib pkgconfig python cairo ];
+ buildInputs = [ flex bison glib pkgconfig python ];
propagatedBuildInputs = [ libffi ];
- configureFlags = "--enable-gcov";
+
+ # Tests depend on cairo, which is undesirable (it pulls in lots of
+ # other dependencies).
+ configureFlags = "--disable-tests";
src = fetchurl {
- url = "mirror://gnome/sources/${baseName}/0.6/${name}.tar.bz2";
- sha256 = "0jwd7bybgvg6dwhg64da8k9yjrs37y5p153gaaapz5j59ld53g9n";
+ url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2";
+ sha256 = "18di6v39hibb6j39vs0a5icaafihfryh8250kz7x1q1313pvm62v";
};
+ postInstall = "rm -rf $out/share/gtk-doc";
+
meta = with stdenv.lib; {
maintainers = [ maintainers.urkud ];
platforms = platforms.linux;