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

gtk needs a new version of pango (which is not clear from the FTP site, bad

Browse Source 
release management!) and pango needs libpng

svn path=/nixpkgs/trunk/; revision=5575
This commit is contained in:
Armijn Hemel 2006-07-04 16:32:35 +00:00
parent 87a20c9da1
commit 4b24c008d7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gtk-libs-2.10/default.nix
View File

@ -1,6 +1,6 @@
{ xineramaSupport ? false { xineramaSupport ? false
, stdenv, fetchurl, pkgconfig, gettext, perl, x11 , stdenv, fetchurl, pkgconfig, gettext, perl, x11
, libtiff, libjpeg, libpng, cairo, libXinerama ? null , libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
}: }:
rec { rec {
@ -14,13 +14,13 @@ rec {
}; };
pango = (import ./pango) { pango = (import ./pango) {
inherit fetchurl stdenv pkgconfig glib x11 cairo; inherit fetchurl stdenv pkgconfig glib x11 cairo libpng;
}; };
gtk = (import ./gtk+) { gtk = (import ./gtk+) {
inherit fetchurl stdenv pkgconfig glib atk pango perl inherit fetchurl stdenv pkgconfig glib atk pango perl
libtiff libjpeg libpng x11 cairo libXinerama libtiff libjpeg libpng x11 cairo libXinerama
xineramaSupport; xineramaSupport libXrandr;
}; };
} }

4
pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
View File

@ -1,6 +1,6 @@
{ xineramaSupport ? false { xineramaSupport ? false
, stdenv, fetchurl, pkgconfig, x11, glib, atk , stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null , pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
}: }:
assert x11.buildClientLibs; assert x11.buildClientLibs;
@ -14,7 +14,7 @@ stdenv.mkDerivation {
md5 = "37cdf73719e8b2af6b0d065df6236542"; md5 = "37cdf73719e8b2af6b0d065df6236542";
}; };
buildInputs = [ buildInputs = [
pkgconfig perl libtiff libjpeg libpng cairo pkgconfig perl libtiff libjpeg libpng cairo libXrandr
(if xineramaSupport then libXinerama else null) (if xineramaSupport then libXinerama else null)
]; ];
propagatedBuildInputs = [x11 glib atk pango]; propagatedBuildInputs = [x11 glib atk pango];

10
pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, pkgconfig, x11, glib, cairo}: {stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng}:
assert x11.buildClientLibs; assert x11.buildClientLibs;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pango-1.12.3"; name = "pango-1.13.2";
src = fetchurl { src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.10/pango-1.12.3.tar.bz2; url = ftp://ftp.gtk.org/pub/gtk/v2.11/pango-1.13.2.tar.gz;
md5 = "c8178e11a895166d86990bb2c38d831b"; md5 = "17d78473c05fece044c6a3b44519b61f";
}; };
buildInputs = [pkgconfig]; buildInputs = [pkgconfig libpng];
propagatedBuildInputs = [x11 glib cairo]; propagatedBuildInputs = [x11 glib cairo];
} }