* Export a variation point `compat22' to specify compatibility with

wxWindows 2.2.

svn path=/nixpkgs/trunk/; revision=794
This commit is contained in:
Eelco Dolstra 2004-02-17 19:18:46 +00:00
parent 5eea59c2cd
commit 057ad6798c
2 changed files with 14 additions and 13 deletions

View File

@ -1,12 +1,15 @@
#! /bin/sh
#! /bin/sh -e
buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib"
. $stdenv/setup || exit 1
. $stdenv/setup
tar xvfj $src || exit 1
cd wxGTK-* || exit 1
./configure --prefix=$out --enable-gtk2 \
--disable-compat22 \
|| exit 1
make || exit 1
make install || exit 1
extraflags=
if test -z "$compat22"; then
extraflags="--disable-compat22 $extraflags"
fi
tar xvfj $src
cd wxGTK-*
./configure --prefix=$out --enable-gtk2 $extraflags
make
make install

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk}:
{stdenv, fetchurl, pkgconfig, gtk, compat22 ? true}:
assert !isNull pkgconfig && !isNull gtk;
assert !isNull gtk.libtiff;
@ -16,11 +16,9 @@ derivation {
md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
};
stdenv = stdenv;
pkgconfig = pkgconfig;
gtk = gtk;
libtiff = gtk.libtiff;
libjpeg = gtk.libjpeg;
libpng = gtk.libpng;
zlib = gtk.libpng.zlib;
inherit stdenv pkgconfig gtk compat22;
}