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/cogl | |
| 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/cogl')
| -rw-r--r-- | pkgs/development/libraries/cogl/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 46a46773810b8..9a151e88778b8 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo }: +, pangoSupport ? true, pango, cairo, gobjectIntrospection }: let ver_maj = "1.16"; @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + configureFlags = " --enable-introspection " ; + propagatedBuildInputs = with xorg; - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage libXrandr ] + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage gobjectIntrospection ] ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; |