diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-05 14:09:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-05 14:09:01 +0000 |
commit | 381c8b926a02b0919e80e12fdf9e7d4a344c1379 (patch) | |
tree | 39fbca0563bda44bc8629b8fa9e59d75662df3b6 /pkgs | |
parent | a1ddfbc3a5e0c0e2d780552ad7bc4d9bee489ce2 (diff) | |
download | nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.tar nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.tar.gz nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.tar.bz2 nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.tar.lz nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.tar.xz nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.tar.zst nixlib-381c8b926a02b0919e80e12fdf9e7d4a344c1379.zip |
* Some applications (notably, everything based on wxGTK) don't work
yet with GTK 2.4. Fortunately, having several GTKs in parallel is no problem for Nix. svn path=/nixpkgs/trunk/; revision=915
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/gtk-libs-2.2/atk/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk-libs-2.2/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk-libs-2.2/glib/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk-libs-2.2/pango/default.nix | 14 | ||||
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 9 | ||||
-rw-r--r-- | pkgs/system/populate-cache.nix | 6 |
7 files changed, 93 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix new file mode 100644 index 000000000000..1089f571099e --- /dev/null +++ b/pkgs/development/libraries/gtk-libs-2.2/atk/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, glib, perl}: + +assert pkgconfig != null && glib != null && perl != null; + +stdenv.mkDerivation { + name = "atk-1.2.4"; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2; + md5 = "2d6d50df31abe0e8892b5d3e7676a02d"; + }; + buildInputs = [pkgconfig perl]; + propagatedBuildInputs = [glib]; +} diff --git a/pkgs/development/libraries/gtk-libs-2.2/default.nix b/pkgs/development/libraries/gtk-libs-2.2/default.nix new file mode 100644 index 000000000000..dc01a534d814 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs-2.2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, gettext, perl, x11 +, libtiff, libjpeg, libpng}: + +rec { + + glib = (import ./glib) { + inherit fetchurl stdenv pkgconfig gettext perl; + }; + + atk = (import ./atk) { + inherit fetchurl stdenv pkgconfig glib perl; + }; + + pango = (import ./pango) { + inherit fetchurl stdenv pkgconfig glib x11; + }; + + gtk = (import ./gtk+) { + inherit fetchurl stdenv pkgconfig glib atk pango perl + libtiff libjpeg libpng x11; + }; + +} diff --git a/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix new file mode 100644 index 000000000000..22d01d0d86f6 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs-2.2/glib/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pkgconfig, gettext, perl}: + +assert pkgconfig != null && gettext != null && perl != null; + +stdenv.mkDerivation { + name = "glib-2.2.3"; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2; + md5 = "aa214a10d873b68ddd67cd9de2ccae55"; + }; + buildInputs = [pkgconfig gettext perl]; +} diff --git a/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix new file mode 100644 index 000000000000..e1eef8058035 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, x11, glib, atk +, pango, perl, libtiff, libjpeg, libpng}: + +assert pkgconfig != null && x11 != null && glib != null && atk != null + && pango != null && perl != null && perl != null && libtiff != null + && libjpeg != null && libpng != null; +assert x11.buildClientLibs; +#assert glib == atk.glib; +#assert glib == pango.glib; +#assert x11 == pango.x11; + +stdenv.mkDerivation { + name = "gtk+-2.2.4"; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2; + md5 = "605332199533e73bc6eec481fb4f1671"; + }; + buildInputs = [pkgconfig perl libtiff libjpeg libpng]; + propagatedBuildInputs = [x11 glib atk pango]; + inherit libtiff libjpeg libpng; +} diff --git a/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix new file mode 100644 index 000000000000..5d5e5184dda7 --- /dev/null +++ b/pkgs/development/libraries/gtk-libs-2.2/pango/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pkgconfig, x11, glib}: + +assert pkgconfig != null && x11 != null && glib != null; +assert x11.buildClientLibs; + +stdenv.mkDerivation { + name = "pango-1.2.5"; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2; + md5 = "df00fe3e71cd297010f24f439b6c8ee6"; + }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [x11 glib]; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 91579aca3aa9..43fc629b7124 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -388,6 +388,11 @@ rec { libtiff libjpeg libpng; }; + gtkLibs22 = import ../development/libraries/gtk-libs-2.2 { + inherit fetchurl stdenv pkgconfig gettext perl x11 + libtiff libjpeg libpng; + }; + gtkLibs1x = import ../development/libraries/gtk-libs-1.x { inherit fetchurl stdenv x11 libtiff libjpeg libpng; }; @@ -399,12 +404,12 @@ rec { gnome = import ../development/libraries/gnome { inherit fetchurl stdenv pkgconfig audiofile flex bison popt perl zlib libxml2 bzip2; - gtkLibs = gtkLibs; + gtkLibs = gtkLibs22; }; wxGTK = (import ../development/libraries/wxGTK) { inherit fetchurl stdenv pkgconfig; - inherit (gtkLibs) gtk; + inherit (gtkLibs22) gtk; }; gnet = (import ../development/libraries/gnet) { diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index dd7c32b9d43f..c1c6fe3ff68f 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -17,7 +17,7 @@ let { pkgs.wget pkgs.par2cmdline pkgs.cksfv -# pkgs.bittorrent + pkgs.bittorrent pkgs.graphviz pkgs.bash pkgs.binutils @@ -44,8 +44,8 @@ let { pkgs.firefox pkgs.MPlayer pkgs.MPlayerPlugin -# pkgs.vlc -# pkgs.zapping + pkgs.vlc + pkgs.zapping pkgs.gqview pkgs.hello pkgs.nxml |