* Don't need to set CAIRO_CFLAGS anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13061

pkgs/development/libraries/cairo/default.nix

@@ -19,13 +19,13 @@ stdenv.mkDerivation {
   buildInputs = [
     pkgconfig x11 fontconfig freetype pixman
   ];
-  
+
   propagatedBuildInputs =
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     
-  configureFlags =
-    (if pdfSupport then ["--enable-pdf"] else []);
+  configureFlags = ["--disable-static"] ++
+    stdenv.lib.optional pdfSupport "--enable-pdf";
 
   meta = {
     description = "A 2D graphics library with support for multiple output devices";

pkgs/development/libraries/gtk-libs/2.12/pango/default.nix

@@ -12,11 +12,6 @@ stdenv.mkDerivation {
   
   propagatedBuildInputs = [x11 glib cairo libpng];
 
-  # The configure script doesn't seem to pick up the Cairo cflags.
-  preConfigure = ''
-    CAIRO_CFLAGS=$(pkg-config --cflags cairo --debug)
-  '';
-
   meta = {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";
     homepage = http://www.pango.org/;