Fix ratpoison dependencies

svn path=/nixpkgs/trunk/; revision=18166
This commit is contained in:
Michael Raskin 2009-11-05 21:53:37 +00:00
parent 82579d30d0
commit 4d02c927e6
5 changed files with 43 additions and 5 deletions

View File

@ -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];
}

View File

@ -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;
};
}

View File

@ -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";
}

View File

@ -0,0 +1,5 @@
{
downloadPage = "http://ftp.gnu.org/gnu/gcl/?C=M;O=D";
sourceRegexp = ".*[.]tar[.]gz\$";
baseName = "gcl";
}

View File

@ -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 {