* Provide a wrapper around `aclocal' (in Automake) that automatically

adds all directories specified in `ACLOCAL_PATH' to the `aclocal'
  command line as `-I' flags.  Also, it provides a setup hook that
  adds the `.../share/aclocal' directory of every build input to
  `ACLOCAL_PATH'.

* Upgraded Libtool.

* Graphviz requires the X Athena widgets, which in turn requires the X
  miscellaneous utilities library; added those.  However it doesn't
  work yet since libXt is broken.
  

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

pkgs/development/compilers/strategoxt/svnbuilder.sh

@@ -1,14 +1,13 @@
-#! /bin/sh
-
-buildinputs="$aterm $sdf $make $automake $autoconf $libtool $which"
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
 echo "pwd = `pwd`"
 echo "PATH = $PATH"
 
-cp -r $src strategoxt || exit 1
+echo "ACLOCAL_PATH = $ACLOCAL_PATH"
+
+cp -r $src strategoxt
 chmod -R +w strategoxt
-cd strategoxt || exit 1
-./bootstrap || exit 1
-./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
-make install || exit 1
+cd strategoxt
+./bootstrap
+./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf
+make install

pkgs/development/compilers/strategoxt/trunk.nix

@@ -1,19 +1,14 @@
-{stdenv, fetchsvn, autotools, which, aterm, sdf}: derivation {
+{stdenv, fetchsvn, autoconf, automake, libtool, which, aterm, sdf}:
+
+stdenv.mkDerivation {
   name = "strategoxt-0.9.4-4792";
-  system = stdenv.system;
+
   builder = ./svnbuilder.sh;
   src = fetchsvn {
     url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
     rev = "4792";
   };
-  stdenv = stdenv;
 
-  make     = autotools.make;
-  automake = autotools.automake;
-  autoconf = autotools.autoconf;
-  libtool  = autotools.libtool;
-  which    = which;
-
-  aterm = aterm;
-  sdf = sdf;
+  buildInputs = [autoconf automake libtool which aterm sdf];
+  inherit aterm sdf libtool;
 }