summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMartin Bravenboer <martin.bravenboer@logicblox.com>2006-05-11 00:16:23 +0000
committerMartin Bravenboer <martin.bravenboer@logicblox.com>2006-05-11 00:16:23 +0000
commit9a1aec2f31586264d24fdb29f19b7987b4d91918 (patch)
tree71a0455f5cd0adb1f007009e58f55bf2ccd75e9f /pkgs
parent93957f48c31bd1911ba733ba3bcb8903419584ba (diff)
downloadnixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.tar
nixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.tar.gz
nixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.tar.bz2
nixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.tar.lz
nixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.tar.xz
nixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.tar.zst
nixlib-9a1aec2f31586264d24fdb29f19b7987b4d91918.zip
Build ruby with ncurses and readline
svn path=/nixpkgs/trunk/; revision=5292
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/ruby/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix3
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) {