diff options
author | Roelof Wobben <rwobben@hotmail.com> | 2013-12-12 19:41:51 +0100 |
---|---|---|
committer | Roelof Wobben <rwobben@hotmail.com> | 2013-12-12 19:41:51 +0100 |
commit | a2c48451a25ca95d82090c3e5e8134dd3a923c97 (patch) | |
tree | 0ec5e464b9b25cc45cf28b1f605ab3f0a76ee157 /pkgs/development | |
parent | d706aab747c1b7e2e5d26d0870c165219c1bcbcd (diff) | |
download | nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.tar nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.tar.gz nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.tar.bz2 nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.tar.lz nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.tar.xz nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.tar.zst nixpkgs-a2c48451a25ca95d82090c3e5e8134dd3a923c97.zip |
enabled introspection for clutter,cogl and json-glib
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/clutter/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/cogl/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/json-glib/default.nix | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 33bc196143b..df3ffc8f60f 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,5 +1,7 @@ { 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 { name = "clutter-1.8.2"; @@ -12,10 +14,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ 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 = { description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index abb92f7b08b..b02319fd3e8 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite , libXdamage, libintlOrEmpty -, pangoSupport ? true, pango, cairo }: +, pangoSupport ? true, pango, cairo, gobjectIntrospection }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -12,8 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + configureFlags = " --enable-introspection " ; + propagatedBuildInputs = - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage +gobjectIntrospection ] ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 8ca1445b1f6..005b9fac2e5 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; }; + configureflags= " --with-introspection " ; + propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection]; meta = { homepage = http://live.gnome.org/JsonGlib; |