* Idem for gtk-libs/2.16.

svn path=/nixpkgs/trunk/; revision=17993
This commit is contained in:
Eelco Dolstra 2009-10-28 15:31:52 +00:00
parent 5398eceff3
commit 82baac23a7
11 changed files with 46 additions and 68 deletions

View file

@ -2,6 +2,7 @@
stdenv.mkDerivation {
name = "xmms-1.2.10";
src = fetchurl {
url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
@ -15,5 +16,6 @@ stdenv.mkDerivation {
meta = {
description = "A music player very similar to Winamp";
homepage = http://www.xmms.org;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,4 +1,4 @@
args: with args;
{ stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
name = "atk-1.24.0";

View file

@ -1,4 +1,4 @@
args: with args;
{ stdenv, fetchurl, pkgconfig, gettext, perl }:
stdenv.mkDerivation rec {
name = "glib-2.20.1";

View file

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

View file

@ -1,4 +1,7 @@
args: with args;
{ stdenv, fetchurl, pkgconfig, perl, jasper, x11, glib, atk, pango
, libtiff, libjpeg, libpng, cairo, xlibs
, xineramaSupport ? true
}:
stdenv.mkDerivation rec {
name = "gtk+-2.16.2";
@ -11,8 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig perl jasper ];
propagatedBuildInputs = [
x11 glib atk pango libtiff libjpeg libpng cairo libXrandr
] ++ stdenv.lib.optional xineramaSupport libXinerama;
x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama;
passthru = { inherit libtiff libjpeg libpng; };

View file

@ -1,21 +0,0 @@
args: with args;
rec {
glib = (import ./glib) args;
glib_2_21 = (import ./glib/2.21.4.nix) args;
atk = (import ./atk) (args // { inherit glib; });
pango = (import ./pango) (args // { inherit glib cairo; });
gtk = (import ./gtk+) (args // {
inherit glib atk pango;
});
glibmm = (import ./glibmm) (args // { inherit glib; });
pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm pangomm; });
}

View file

@ -1,32 +0,0 @@
args: with args;
stdenv.mkDerivation rec {
name = "glib-2.21.4";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.21/${name}.tar.bz2";
sha256 = "b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d";
};
buildInputs = [pkgconfig gettext perl];
# The nbd package depends on a static version of this library; hence
# the default configure flag --disable-static is switched off.
dontDisableStatic = true;
configureFlags = "--enable-static --enable-shared";
meta = {
description = "GLib, a C library of programming buildings blocks";
longDescription = ''
GLib provides the core application building blocks for libraries
and applications written in C. It provides the core object
system used in GNOME, the main loop implementation, and a large
set of utility functions for strings and common data structures.
'';
homepage = http://www.gtk.org/;
license = "LGPLv2+";
};
}

View file

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

View file

@ -1,4 +1,4 @@
args: with args;
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
name = "pango-1.24.1";

View file

@ -1,7 +1,7 @@
args: with args;
{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
stdenv.mkDerivation rec {
name ="pangomm-2.14.1";
name = "pangomm-2.14.1";
src = fetchurl {
url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2";

View file

@ -3575,11 +3575,37 @@ let
};
gtkLibs216 = import ../development/libraries/gtk-libs/2.16 {
inherit fetchurl stdenv pkgconfig gettext perl x11 jasper
libtiff libjpeg libpng cairo libsigcxx cairomm;
inherit (xlibs) libXinerama libXrandr;
xineramaSupport = true;
gtkLibs216 = rec {
glib = import ../development/libraries/glib/2.20.x.nix {
inherit fetchurl stdenv pkgconfig gettext perl;
};
glibmm = import ../development/libraries/glibmm/2.18.x.nix {
inherit fetchurl stdenv pkgconfig glib libsigcxx;
};
atk = import ../development/libraries/atk/1.24.x.nix {
inherit fetchurl stdenv pkgconfig perl glib;
};
pango = import ../development/libraries/pango/1.24.x.nix {
inherit fetchurl stdenv pkgconfig gettext x11 glib cairo libpng;
};
pangomm = import ../development/libraries/pangomm/2.14.x.nix {
inherit fetchurl stdenv pkgconfig pango glibmm cairomm libpng;
};
gtk = import ../development/libraries/gtk+/2.16.x.nix {
inherit fetchurl stdenv pkgconfig perl jasper x11 glib atk pango
libtiff libjpeg libpng cairo xlibs;
};
gtkmm = import ../development/libraries/gtkmm/2.14.x.nix {
inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
};
};
gtkLibs218 = import ../development/libraries/gtk-libs/2.18 {