* Got rid of all --disable-static flags; they're redundant now.

* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
This commit is contained in:
Eelco Dolstra
2009-04-21 23:18:09 +00:00
parent 2a699fe5fb
commit 94d7d1fdbb
75 changed files with 241 additions and 336 deletions
@@ -15,9 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
++ (if qt4Support then [qt4] else []);
configureFlags = "--enable-shared --disable-static --enable-exceptions
--enable-cairo --enable-splash --enable-poppler-glib --enable-zlib
--enable-xpdf-headers "
configureFlags =
''
--enable-exceptions --enable-cairo --enable-splash
--enable-poppler-glib --enable-zlib --enable-xpdf-headers
''
+ (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
patches = [ ./GDir-const.patch ./use_exceptions.patch ];