Restore libsigsegv-2.5 and fix clisp-2.44.1 build for bootstrapping needs

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

2 files changed, 24 insertions, 3 deletions

diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
new file mode 100644
index 00000000000..9dd50c37c61
--- /dev/null
+++ b/pkgs/development/libraries/libsigsegv/2.5.nix
@@ -0,0 +1,17 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "libsigsegv-2.5";
+  
+  src = fetchurl {
+    url = "mirror://gnu/libsigsegv/${name}.tar.gz";
+    sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg";
+  };
+
+  meta = {
+    homepage = http://libsigsegv.sf.net;
+    description = "A library for handling page faults in user mode";
+  };
+
+  doCheck = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5cc5fc073e3..f63bc7854f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1998,8 +1998,7 @@ let
 
   sbcl = builderDefsPackage (import ../development/compilers/sbcl) {
     inherit makeWrapper;
-    # clisp = clisp_2_44_1;
-    clisp = clisp;
+    clisp = clisp_2_44_1;
   };
 
   scala = import ../development/compilers/scala {
@@ -2086,10 +2085,11 @@ let
   # compatibility issues in 2.47 - at list 2.44.1 is known good
   # for sbcl bootstrap
   clisp_2_44_1 = import ../development/interpreters/clisp/2.44.1.nix {
-    inherit fetchurl stdenv libsigsegv gettext
+    inherit fetchurl stdenv gettext
       readline ncurses coreutils pcre zlib libffi libffcall;
     inherit (xlibs) libX11 libXau libXt xproto
       libXpm libXext xextproto;
+    libsigsegv = libsigsegv_25;
   };
 
   erlang = import ../development/interpreters/erlang {
@@ -3612,6 +3612,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
+  libsigsegv_25 =  builderDefsPackage ../development/libraries/libsigsegv/2.5.nix {
+  };
+
   libsndfile = import ../development/libraries/libsndfile {
     inherit fetchurl stdenv;
   };