* Add readline 4 (in addition to readline 5).

svn path=/nixpkgs/trunk/; revision=3990
This commit is contained in:
Eelco Dolstra 2005-10-02 14:54:58 +00:00
parent 7583231221
commit 33ddaafc57
3 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation {
name = "readline-4.3";
src = fetchurl {
url = http://ftp.gnu.org/pub/gnu/readline/readline-4.3.tar.gz;
md5 = "f86f7cb717ab321fe15f1bbcb058c11e";
};
inherit ncurses;
buildInputs = [ncurses];
}

View File

@ -2,7 +2,6 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "readline-5.0"; name = "readline-5.0";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/readline-5.0.tar.gz; url = http://nix.cs.uu.nl/dist/tarballs/readline-5.0.tar.gz;
md5 = "9a39d15f1ed592883f8c6671e8c13120"; md5 = "9a39d15f1ed592883f8c6671e8c13120";

View File

@ -1147,10 +1147,16 @@ rec {
inherit (gtkLibs) glib gtk; inherit (gtkLibs) glib gtk;
}; };
readline = (import ../development/libraries/readline) { readline4 = (import ../development/libraries/readline/readline4.nix) {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
readline5 = (import ../development/libraries/readline/readline5.nix) {
inherit fetchurl stdenv ncurses;
};
readline = readline5;
SDL = (import ../development/libraries/SDL) { SDL = (import ../development/libraries/SDL) {
inherit fetchurl stdenv x11; inherit fetchurl stdenv x11;
}; };