* Export a variation point `compat22' to specify compatibility with
wxWindows 2.2. svn path=/nixpkgs/trunk/; revision=794
This commit is contained in:
parent
5eea59c2cd
commit
057ad6798c
@ -1,12 +1,15 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh -e
|
||||||
|
|
||||||
buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib"
|
buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib"
|
||||||
. $stdenv/setup || exit 1
|
. $stdenv/setup
|
||||||
|
|
||||||
tar xvfj $src || exit 1
|
extraflags=
|
||||||
cd wxGTK-* || exit 1
|
if test -z "$compat22"; then
|
||||||
./configure --prefix=$out --enable-gtk2 \
|
extraflags="--disable-compat22 $extraflags"
|
||||||
--disable-compat22 \
|
fi
|
||||||
|| exit 1
|
|
||||||
make || exit 1
|
tar xvfj $src
|
||||||
make install || exit 1
|
cd wxGTK-*
|
||||||
|
./configure --prefix=$out --enable-gtk2 $extraflags
|
||||||
|
make
|
||||||
|
make install
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, pkgconfig, gtk}:
|
{stdenv, fetchurl, pkgconfig, gtk, compat22 ? true}:
|
||||||
|
|
||||||
assert !isNull pkgconfig && !isNull gtk;
|
assert !isNull pkgconfig && !isNull gtk;
|
||||||
assert !isNull gtk.libtiff;
|
assert !isNull gtk.libtiff;
|
||||||
@ -16,11 +16,9 @@ derivation {
|
|||||||
md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
|
md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
|
||||||
};
|
};
|
||||||
|
|
||||||
stdenv = stdenv;
|
|
||||||
pkgconfig = pkgconfig;
|
|
||||||
gtk = gtk;
|
|
||||||
libtiff = gtk.libtiff;
|
libtiff = gtk.libtiff;
|
||||||
libjpeg = gtk.libjpeg;
|
libjpeg = gtk.libjpeg;
|
||||||
libpng = gtk.libpng;
|
libpng = gtk.libpng;
|
||||||
zlib = gtk.libpng.zlib;
|
zlib = gtk.libpng.zlib;
|
||||||
|
inherit stdenv pkgconfig gtk compat22;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user