* wxGTK 2.6.

* Also updated chmlib, xchm.

svn path=/nixpkgs/trunk/; revision=4109
This commit is contained in:
Eelco Dolstra 2005-10-19 15:15:37 +00:00
parent 154fbad053
commit 33eee5d50d
6 changed files with 52 additions and 10 deletions

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, wxGTK, chmlib}:
stdenv.mkDerivation {
name = "xchm-0.9.1";
name = "xchm-1.2";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
url = http://surfnet.dl.sourceforge.net/sourceforge/xchm/xchm-1.2.tar.gz;
md5 = "17f2cda873f61470636dbfeebb4a531d";
};
buildInputs = [wxGTK chmlib];
}

View File

@ -2,14 +2,19 @@
unpackCmd="tar xvfj $src"
makeFlags="CC=gcc LD=gcc INSTALLPREFIX=$out"
makeFlags="-f Makefile.simple CC=gcc LD=gcc INSTALLPREFIX=$out"
postConfigure=postConfigure
postConfigure() {
cd src
}
preInstall=preInstall
preInstall() {
mkdir $out
mkdir $out/lib
mkdir $out/include
}
preInstall=preInstall
installFlags=$makeFlags

View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libtool}:
stdenv.mkDerivation {
name = "chmlib-0.33";
name = "chmlib-0.36";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.33.tbz;
md5 = "8bc84e94f1cea65005e5cb0ab40e2e86";
url = http://66.93.236.84/%7Ejedwin/projects/chmlib/chmlib-0.36.tbz;
md5 = "8fa5e9a1af13084ca465d9ee09e1946e";
};
buildInputs = [libtool];
}

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.6.2";
src = fetchurl {
url = http://surfnet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.6.2.tar.bz2;
md5 = "ba2afe7bd028062c5fff6d5ef3249c67";
};
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

@ -878,7 +878,15 @@ rec {
inherit (xlibs) libXmu;
};
wxGTK = (import ../development/libraries/wxGTK-2.5) {
wxGTK = wxGTK26;
wxGTK26 = (import ../development/libraries/wxGTK-2.6) {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama;
};
wxGTK25 = (import ../development/libraries/wxGTK-2.5) {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama;

View File

@ -82,7 +82,7 @@ let {
batik
# fspot
hello
# xchm
xchm
nxml
uml
nix