strategoxt should use sdf bundle

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

3 files changed, 17 insertions, 5 deletions

diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh
index 5d3427b3a77f..9cc206871975 100644
--- a/pkgs/development/compilers/strategoxt/builder.sh
+++ b/pkgs/development/compilers/strategoxt/builder.sh
@@ -1,4 +1,4 @@
 . $stdenv/setup
 
-configureFlags="--with-aterm=$aterm --with-sdf=$sdf"
+configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen --with-pt-support=$ptsupport --with-asf-library=$asflibrary"
 genericBuild
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix
index 98bcad9617de..848874ecf66a 100644
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix
+++ b/pkgs/development/compilers/strategoxt/strategoxt-0.10.nix
@@ -1,12 +1,18 @@
 {stdenv, fetchurl, aterm, sdf}:
 
 stdenv.mkDerivation {
+
   name = "strategoxt-0.10";
+
   builder = ./builder.sh;
+
   src = fetchurl {
     url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.10.tar.gz;
     md5 = "526a28e84248b649bb098b22d227cd26";
   };
-  inherit aterm sdf;
-  buildInputs = [aterm sdf];
+
+  inherit aterm;
+  inherit (sdf) sglr pgen ptsupport asflibrary;
+
+  buildInputs = [aterm sdf.pgen];
 }
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix
index 708dec174ee6..2e431e8c093d 100644
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix
+++ b/pkgs/development/compilers/strategoxt/strategoxt-0.11.nix
@@ -1,12 +1,18 @@
 {stdenv, fetchurl, aterm, sdf}:
 
 stdenv.mkDerivation {
+
   name = "strategoxt-0.11";
+
   builder = ./builder.sh;
+
   src = fetchurl {
     url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.11.tar.gz;
     md5 = "bf6c38179f6883b01fa3e548c4f45f1c";
   };
-  inherit aterm sdf;
-  buildInputs = [aterm sdf];
+
+  inherit aterm;
+  inherit (sdf) sglr pgen ptsupport asflibrary;
+
+  buildInputs = [aterm sdf.pgen];
 }