added seperate meta-environment packages, use callpackage for aterm28

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

2 files changed, 82 insertions, 0 deletions

diff --git a/pkgs/development/libraries/asc-support/default.nix b/pkgs/development/libraries/asc-support/default.nix
new file mode 100644
index 000000000000..a078faaceb12
--- /dev/null
+++ b/pkgs/development/libraries/asc-support/default.nix
@@ -0,0 +1,34 @@
+
+{ stdenv
+, fetchurl
+, aterm
+, toolbuslib
+, asfSupport
+, errorSupport
+, ptSupport
+, sglr
+, tideSupport
+, cLibrary
+, configSupport 
+, ptableSupport
+, rstoreSupport
+, pkgconfig
+}:
+let 
+  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
+in
+stdenv.mkDerivation rec {
+  name = "asc-support-2.6";
+
+  src = fetchurl {
+    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
+    sha256 = "1svq368kdxnmjdfv8sqs0cn9s69c75qcp44mpapfjj6kfhrzkxdc";
+  };
+  
+  patches = if isMingw then [./mingw.patch] else [];
+
+  buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ];
+  buildNativeInputs = [pkgconfig];
+  
+  dontStrip = isMingw;
+}  
diff --git a/pkgs/development/libraries/asc-support/mingw.patch b/pkgs/development/libraries/asc-support/mingw.patch
new file mode 100644
index 000000000000..8a421a99dae7
--- /dev/null
+++ b/pkgs/development/libraries/asc-support/mingw.patch
@@ -0,0 +1,48 @@
+diff -rc asc-support-2.6/lib/asc-main.c asc-support-2.6-new/lib/asc-main.c
+*** asc-support-2.6/lib/asc-main.c	2008-11-10 14:12:47.000000000 +0100
+--- asc-support-2.6-new/lib/asc-main.c	2010-08-24 11:02:04.000000000 +0200
+***************
+*** 7,13 ****
+  #include <ctype.h>
+  #include <string.h>
+  #include <sys/time.h>
+- #include <sys/resource.h>
+  #include <unistd.h>
+  #include <aterm2.h>
+  #include <sglrInterface.h>
+--- 7,12 ----
+***************
+*** 46,52 ****
+  }
+  
+  static void printStats() {
+-   struct rusage usage;
+    FILE *file;
+    char buf[BUFSIZ];
+    int size, resident, shared, trs, lrs, drs, dt;
+--- 45,50 ----
+***************
+*** 61,74 ****
+      fprintf(stderr, "could not open %s\n", buf);
+      perror("");
+    }
+!   if (getrusage(RUSAGE_SELF, &usage) == -1) {
+!     perror("rusage");
+!   } else {
+!     fprintf(stderr, "utime       : %ld.%06d sec.\n",
+! 	    (long)usage.ru_utime.tv_sec, (int)usage.ru_utime.tv_usec);
+!     fprintf(stderr, "stime       : %ld.%06d sec.\n",
+! 	    (long)usage.ru_stime.tv_sec, (int)usage.ru_stime.tv_usec);
+!   }
+  }
+  
+  static ATbool toolbusMode(int argc, char* argv[]) {
+--- 59,66 ----
+      fprintf(stderr, "could not open %s\n", buf);
+      perror("");
+    }
+!   fprintf(stderr, "utime       : %ld.%06d sec.\n", 0, 0);
+!   fprintf(stderr, "stime       : %ld.%06d sec.\n", 0, 0);
+  }
+  
+  static ATbool toolbusMode(int argc, char* argv[]) {