diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-02 14:54:58 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-02 14:54:58 +0000 |
| commit | 33ddaafc57e4568a5d4a8883f255c8dd26a43117 (patch) | |
| tree | 6672d1c6ab38c30d70611848ea37fbf92b8e5c91 | |
| parent | 7583231221cf290493bd8a7c6d2032af5c191528 (diff) | |
| download | nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.tar nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.tar.gz nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.tar.bz2 nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.tar.lz nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.tar.xz nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.tar.zst nixlib-33ddaafc57e4568a5d4a8883f255c8dd26a43117.zip | |
* Add readline 4 (in addition to readline 5).
svn path=/nixpkgs/trunk/; revision=3990
| -rw-r--r-- | pkgs/development/libraries/readline/readline4.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/readline5.nix (renamed from pkgs/development/libraries/readline/default.nix) | 1 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/development/libraries/readline/readline4.nix b/pkgs/development/libraries/readline/readline4.nix new file mode 100644 index 000000000000..74944fdf6b8f --- /dev/null +++ b/pkgs/development/libraries/readline/readline4.nix @@ -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]; +} diff --git a/pkgs/development/libraries/readline/default.nix b/pkgs/development/libraries/readline/readline5.nix index b67cf23339ae..fe463432d4bf 100644 --- a/pkgs/development/libraries/readline/default.nix +++ b/pkgs/development/libraries/readline/readline5.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "readline-5.0"; - builder = ./builder.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/readline-5.0.tar.gz; md5 = "9a39d15f1ed592883f8c6671e8c13120"; diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index d4febe859ff5..65c5e538bb24 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1147,10 +1147,16 @@ rec { inherit (gtkLibs) glib gtk; }; - readline = (import ../development/libraries/readline) { + readline4 = (import ../development/libraries/readline/readline4.nix) { inherit fetchurl stdenv ncurses; }; + readline5 = (import ../development/libraries/readline/readline5.nix) { + inherit fetchurl stdenv ncurses; + }; + + readline = readline5; + SDL = (import ../development/libraries/SDL) { inherit fetchurl stdenv x11; }; |