public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1365 from roelof1967/clutter

Browse Source 
enabled introspection for clutter,cogl and json-glib
This commit is contained in:
Michael Raskin 2013-12-14 22:53:21 -08:00
commit 76cde34423
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/clutter/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }: , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib,
gobjectIntrospection
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "clutter-1.8.2"; name = "clutter-1.8.2";
@ -12,10 +14,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = propagatedBuildInputs =
[ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
atk json_glib atk json_glib gobjectIntrospection
]; ];
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
meta = { meta = {
description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; description = "Clutter, a library for creating fast, dynamic graphical user interfaces";

7
pkgs/development/libraries/cogl/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite
, libXdamage, libintlOrEmpty , libXdamage, libintlOrEmpty
, pangoSupport ? true, pango, cairo }: , pangoSupport ? true, pango, cairo, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cogl-1.8.2"; name = "cogl-1.8.2";
@ -12,8 +12,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
configureFlags = " --enable-introspection " ;
propagatedBuildInputs = propagatedBuildInputs =
[ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage
gobjectIntrospection ]
++ libintlOrEmpty; ++ libintlOrEmpty;
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];

6
pkgs/development/libraries/json-glib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl_gnome, glib, pkgconfig }: { stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = src.pkgname;
@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq";
}; };
configureflags= " --with-introspection " ;
propagatedBuildInputs = [ glib ]; propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig gobjectIntrospection];
meta = { meta = {
homepage = http://live.gnome.org/JsonGlib; homepage = http://live.gnome.org/JsonGlib;