* Use wxGTK 2.5 by default (since it works with the latest gtk, and is

probably stable enough).
* Supply installable gcc 3.4.

svn path=/nixpkgs/trunk/; revision=1483
This commit is contained in:
Eelco Dolstra 2004-09-21 15:31:23 +00:00
parent aeee7551f0
commit c323b0f250
3 changed files with 49 additions and 6 deletions

View file

@ -0,0 +1,29 @@
{stdenv, fetchurl, pkgconfig, gtk, libXinerama, compat22 ? true}:
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
stdenv.mkDerivation {
name = "wxGTK-2.5.2";
src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.5.2.tar.bz2;
md5 = "b45874428b0164bfa5bd1a5a11b3eb4a";
};
buildInputs = [
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama
];
configureFlags = [
"--enable-gtk2"
(if compat22 then "--enable-compat22" else "--disable-compat22")
"--disable-precomp-headers"
];
inherit gtk compat22;
}

View file

@ -251,6 +251,14 @@ rec {
profiledCompiler = gccWithProfiling;
};
gccWrapped = (import ../build-support/gcc-wrapper) {
nativeTools = false;
nativeGlibc = false;
gcc = stdenv.gcc;
inherit (stdenv.gcc) binutils glibc;
inherit stdenv;
};
gcc_static = (import ../stdenv/nix-linux/gcc-static) {
inherit fetchurl stdenv;
};
@ -553,11 +561,18 @@ rec {
gnome = import ../development/libraries/gnome {
inherit fetchurl stdenv pkgconfig audiofile
flex bison popt perl zlib libxml2 bzip2;
flex bison popt perl zlib libxml2 bzip2
perlXMLParser;
gtkLibs = gtkLibs22;
};
wxGTK = (import ../development/libraries/wxGTK) {
wxGTK = (import ../development/libraries/wxGTK-2.5) {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama;
};
wxGTK24 = (import ../development/libraries/wxGTK) {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs22) gtk;
};
@ -780,7 +795,7 @@ rec {
};
vlc = (import ../applications/video/vlc) {
inherit fetchurl stdenv wxGTK libdvdcss libdvdplay
inherit fetchurl stdenv libdvdcss wxGTK libdvdplay
mpeg2dec a52dec libmad x11;
inherit (xlibs) libXv;
alsa = alsaLib;

View file

@ -29,8 +29,7 @@ let {
gnumake
bisonnew
flexnew
gcc
gcc34
gccWrapped
aterm
strategoxt
xdoc
@ -85,5 +84,5 @@ let {
body = [
i686LinuxPkgs
powerpcDarwinPkgs
];
];
}