* Provide a patched ATerm library that works on 64-bit systems and on

  systems with Glibc 2.5 or GCC 4.1.x.

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

2 files changed, 24 insertions, 2 deletions

diff --git a/pkgs/development/libraries/aterm/2.4.2-fixes.nix b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
new file mode 100644
index 000000000000..d05419a1180a
--- /dev/null
+++ b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "aterm-2.4.2-fixes";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aterm-2.4.2-fixes.tar.bz2;
+    md5 = "0622feaaa97c1e411e16f480f64e75fa";
+  };
+  patches = 
+    (if stdenv ? isMinGW && stdenv.isMinGW then [./mingw-asm.patch] else []);
+  meta = {
+    homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
+    license = "LGPL";
+    description = "Library for manipulation of term data structures in C";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 104d9a45de48..4e402744cb32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1153,6 +1153,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix {
+    inherit fetchurl stdenv;
+  };
+
   aterm23x = import ../development/libraries/aterm/2.3.nix {
     inherit fetchurl stdenv;
   };
@@ -2812,12 +2816,14 @@ rec {
   };
 
   nix = import ../misc/nix {
-    inherit fetchurl stdenv aterm perl curl bzip2;
+    inherit fetchurl stdenv perl curl bzip2;
+    aterm = aterm242fixes;
     db4 = db44;
   };
 
   nixStatic = import ../misc/nix-static {
-    inherit fetchurl stdenv aterm perl curl autoconf automake libtool;
+    inherit fetchurl stdenv perl curl autoconf automake libtool;
+    aterm = aterm242fixes;
     bdb = db4;
   };