From 9a1aec2f31586264d24fdb29f19b7987b4d91918 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Thu, 11 May 2006 00:16:23 +0000 Subject: [PATCH] Build ruby with ncurses and readline svn path=/nixpkgs/trunk/; revision=5292 --- pkgs/development/interpreters/ruby/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index f8e7af8ab6e5..728a7bb78cdb 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, ncurses, readline}: stdenv.mkDerivation { name = "ruby-1.8.4"; @@ -6,4 +6,6 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/ruby-1.8.4.tar.gz; md5 = "bd8c2e593e1fa4b01fd98eaf016329bb"; }; + + buildInputs = [ncurses readline]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13c051d3a89e..e195da5288f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -727,6 +727,7 @@ rec { (import ../development/compilers/abc/default.nix) { inherit stdenv fetchurl patches jre; apacheAnt = apacheAntBlackdown14; + apacheAntAbc = apacheAnt; javaCup = import ../development/libraries/java/cup { inherit stdenv fetchurl; jdk = blackdown; @@ -847,7 +848,7 @@ rec { }; ruby = (import ../development/interpreters/ruby) { - inherit fetchurl stdenv; + inherit fetchurl stdenv readline ncurses; }; spidermonkey = (import ../development/interpreters/spidermonkey) {