* Gnome 2.14.3.
* GTK updates. * Removed the bzip2 hack. svn path=/nixpkgs/trunk/; revision=6104
This commit is contained in:
@@ -1,26 +0,0 @@
|
||||
{ postscriptSupport ? true
|
||||
, pdfSupport ? true
|
||||
, pngSupport ? true
|
||||
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
|
||||
, zlib, libpng
|
||||
}:
|
||||
|
||||
assert postscriptSupport -> zlib != null;
|
||||
assert pngSupport -> libpng != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cairo-1.2.0";
|
||||
src = fetchurl {
|
||||
url = http://cairographics.org/releases/cairo-1.2.0.tar.gz;
|
||||
sha1 = "c5da7f89cdd3782102357f99a47f516d11661e92";
|
||||
};
|
||||
buildInputs = [
|
||||
pkgconfig x11 fontconfig freetype
|
||||
(if pngSupport then libpng else null)
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
(if postscriptSupport then zlib else null)
|
||||
];
|
||||
configureFlags =
|
||||
(if pdfSupport then ["--enable-pdf"] else []);
|
||||
}
|
||||
@@ -9,10 +9,10 @@ assert postscriptSupport -> zlib != null;
|
||||
assert pngSupport -> libpng != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cairo-1.0.4";
|
||||
name = "cairo-1.2.2";
|
||||
src = fetchurl {
|
||||
url = http://cairographics.org/releases/cairo-1.0.4.tar.gz;
|
||||
sha1 = "89e72202e5b51a8914fce60f52f7c51ecdea982a";
|
||||
url = http://cairographics.org/releases/cairo-1.2.2.tar.gz;
|
||||
sha1 = "859b9ed4eaa200a03b9e41ccc45f3799742e6c5c";
|
||||
};
|
||||
buildInputs = [
|
||||
pkgconfig x11 fontconfig freetype
|
||||
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
(if postscriptSupport then zlib else null)
|
||||
(if pngSupport then libpng else null)
|
||||
];
|
||||
configureFlags =
|
||||
(if pdfSupport then ["--enable-pdf"] else []);
|
||||
|
||||
Reference in New Issue
Block a user