gtk-libs-2.10: other syntax

svn path=/nixpkgs/branches/stdenv-updates/; revision=10475
This commit is contained in:
Yury G. Kudryashov 2008-02-03 13:17:41 +00:00
parent 598199c93d
commit 09e96afbda
7 changed files with 11 additions and 38 deletions

View File

@ -1,6 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, perl}:
assert pkgconfig != null && glib != null && perl != null;
args: with args;
stdenv.mkDerivation {
name = "atk-1.12.4";

View File

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

View File

@ -1,6 +1,4 @@
{stdenv, fetchurl, pkgconfig, gettext, perl}:
assert pkgconfig != null && gettext != null && perl != null;
args: with args;
stdenv.mkDerivation {
name = "glib-2.12.13"; # <- sic! gtk 2.10 needs glib 2.12

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, libsigcxx}:
args: with args;
stdenv.mkDerivation {
name = "glibmm-2.12.10";

View File

@ -1,11 +1,4 @@
{ xineramaSupport ? false
, stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
}:
assert x11.buildClientLibs;
assert xineramaSupport -> libXinerama != null;
args: with args;
stdenv.mkDerivation {
name = "gtk+-2.10.14";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, libsigcxx}:
args: with args;
stdenv.mkDerivation {
name = "gtkmm-2.10.11";

View File

@ -1,6 +1,4 @@
{stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng}:
assert x11.buildClientLibs;
args: with args;
stdenv.mkDerivation {
name = "pango-1.14.10";