From de387a036883bbac1e735f8d67240422efe2d974 Mon Sep 17 00:00:00 2001
From: Eelco Visser <visser@acm.org>
Date: Wed, 28 Jul 2004 13:12:28 +0000
Subject: [PATCH] strategoxt should use sdf bundle

svn path=/nixpkgs/trunk/; revision=1194
---
 pkgs/development/compilers/strategoxt/builder.sh       |  2 +-
 .../compilers/strategoxt/strategoxt-0.10.nix           | 10 ++++++++--
 .../compilers/strategoxt/strategoxt-0.11.nix           | 10 ++++++++--
 pkgs/system/all-packages-generic.nix                   |  6 +++---
 4 files changed, 20 insertions(+), 8 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];
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 4d2e5288c882..61dd88ba7f6a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -254,12 +254,12 @@ rec {
 
   strategoxt = (import ../development/compilers/strategoxt) {
     inherit fetchurl stdenv aterm;
-    sdf = sdf2_bundle;
+    sdf = sdf_22;
   };
 
   strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
     inherit fetchsvn stdenv autoconf automake libtool which aterm;
-    sdf = sdf2_bundle;
+    sdf = sdf_22;
   };
 
   strategoxtdailydist = (import ../development/compilers/strategoxt/dailydist.nix) {
@@ -269,7 +269,7 @@ rec {
 
   tiger = (import ../development/compilers/tiger) {
     inherit fetchurl stdenv aterm strategoxt;
-    sdf = sdf2_bundle;
+    sdf = sdf_22;
   };
 
   ghcboot = (import ../development/compilers/ghc/boot.nix) {