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

Merge master into x-updates

Browse Source 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
This commit is contained in:
Vladimír Čunát
2013-12-18 23:21:29 +01:00
parent e8394e3f8c 43498628e8
commit 4c5a71f777
431 changed files with 2365 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/cogl/default.nix
+4 -2
View File
@@ -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 ];