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

* Don't need to set CAIRO_CFLAGS anymore.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13061
This commit is contained in:
Eelco Dolstra 2008-10-14 12:08:07 +00:00
parent 5bc2dc536d
commit 5b45cce6c1
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/cairo/default.nix
View File

@ -24,8 +24,8 @@ stdenv.mkDerivation {
stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng; stdenv.lib.optional pngSupport libpng;
configureFlags = configureFlags = ["--disable-static"] ++
(if pdfSupport then ["--enable-pdf"] else []); stdenv.lib.optional pdfSupport "--enable-pdf";
meta = { meta = {
description = "A 2D graphics library with support for multiple output devices"; description = "A 2D graphics library with support for multiple output devices";

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

@ -12,11 +12,6 @@ stdenv.mkDerivation {
propagatedBuildInputs = [x11 glib cairo libpng]; 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 = { meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization"; description = "A library for laying out and rendering of text, with an emphasis on internationalization";
homepage = http://www.pango.org/; homepage = http://www.pango.org/;