diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
| commit | 4c5a71f777769b1f2516096532424cd42531aa1f (patch) | |
| tree | a5eb1c36a9363911ce264c7ed573b2f3cc6a7798 /pkgs/development/libraries/clutter | |
| parent | e8394e3f8c7d464bc27a344a982648c20a08a6d7 (diff) | |
| parent | 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 (diff) | |
Merge master into x-updates
Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix
Diffstat (limited to 'pkgs/development/libraries/clutter')
| -rw-r--r-- | pkgs/development/libraries/clutter/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index fbfa6bc711be1..808e67cd852b2 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 +}: let ver_maj = "1.16"; @@ -16,10 +18,10 @@ stdenv.mkDerivation rec { 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 #doCheck = true; # no tests possible without a display |