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

  wxWindows 2.2.

svn path=/nixpkgs/trunk/; revision=794

2 files changed, 14 insertions, 13 deletions

diff --git a/pkgs/development/libraries/wxGTK/builder.sh b/pkgs/development/libraries/wxGTK/builder.sh
index 786ebef59a793..64e4a5ff832d1 100755
--- a/pkgs/development/libraries/wxGTK/builder.sh
+++ b/pkgs/development/libraries/wxGTK/builder.sh
@@ -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
diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix
index a80824514ec6c..0645de6495d74 100644
--- a/pkgs/development/libraries/wxGTK/default.nix
+++ b/pkgs/development/libraries/wxGTK/default.nix
@@ -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;
 }