Fix ratpoison dependencies

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

5 files changed, 43 insertions, 5 deletions

diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 0f31217d315b..dcebc8d055a8 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig,
-	libXtst, xextproto, readline}:
+	libXtst, xextproto, readline, libXi}:
 stdenv.mkDerivation {
   name = "ratpoison-1.4.5";
 
@@ -10,5 +10,5 @@ stdenv.mkDerivation {
 
   buildInputs = [libX11 inputproto libXt
 	 libXpm libXft fontconfig libXtst
-	xextproto readline];
+	xextproto readline libXi];
 }
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
new file mode 100644
index 000000000000..b4d4859c21d4
--- /dev/null
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -0,0 +1,26 @@
+a :  
+let 
+  s = import ./src-for-default.nix;
+  buildInputs = with a; [
+    gmp mpfr m4 binutils 
+  ]; 
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "GNU Common Lisp compiler working via GCC";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms; 
+      all;
+  };
+}
diff --git a/pkgs/development/compilers/gcl/src-for-default.nix b/pkgs/development/compilers/gcl/src-for-default.nix
new file mode 100644
index 000000000000..0a1d0aa5fc3a
--- /dev/null
+++ b/pkgs/development/compilers/gcl/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="2.6.7";
+   name="gcl-2.6.7";
+   hash="01icfa7iaxninhyhpkzjbhcrr2wbnw6x0sk680zx0api0fy3989a";
+   url="http://ftp.gnu.org/gnu/gcl/gcl-${version}.tar.gz";
+   advertisedUrl="http://ftp.gnu.org/gnu/gcl/gcl-2.6.7.tar.gz";
+  
+  
+}
diff --git a/pkgs/development/compilers/gcl/src-info-for-default.nix b/pkgs/development/compilers/gcl/src-info-for-default.nix
new file mode 100644
index 000000000000..a186fdb108a8
--- /dev/null
+++ b/pkgs/development/compilers/gcl/src-info-for-default.nix
@@ -0,0 +1,5 @@
+{
+  downloadPage = "http://ftp.gnu.org/gnu/gcl/?C=M;O=D";
+  sourceRegexp = ".*[.]tar[.]gz\$";
+  baseName = "gcl";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b767899624a..7796ab74ab14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1938,11 +1938,9 @@ let
       libXrandr xproto renderproto xextproto inputproto randrproto;
   });
 
-  /*
   gcl = builderDefsPackage ../development/compilers/gcl {
     inherit gmp mpfr m4 binutils ;
   };
-  */
 
   # GHC
 
@@ -7459,7 +7457,7 @@ let
   ratpoison = import ../applications/window-managers/ratpoison {
     inherit fetchurl stdenv fontconfig readline;
     inherit (xlibs) libX11 inputproto libXt libXpm libXft
-      libXtst xextproto;
+      libXtst xextproto libXi;
   };
 
   rcs = import ../applications/version-management/rcs {