From c389786b156b16c71eaf1c3294ceb6ec848e442d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 5 Aug 2004 15:30:06 +0000
Subject: [PATCH] * octave uses readline

svn path=/nixpkgs/trunk/; revision=1232
---
 pkgs/development/interpreters/octave/builder.sh  | 3 +--
 pkgs/development/interpreters/octave/default.nix | 7 ++++---
 pkgs/system/all-packages-generic.nix             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/octave/builder.sh b/pkgs/development/interpreters/octave/builder.sh
index 72cbd4e5b24..244f8ef9553 100644
--- a/pkgs/development/interpreters/octave/builder.sh
+++ b/pkgs/development/interpreters/octave/builder.sh
@@ -1,6 +1,5 @@
 set -x
 
-buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf"
 . $stdenv/setup
 
 g77orig=$(cat $g77/nix-support/orig-gcc)
@@ -12,7 +11,7 @@ export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
 tar xvfz $src
 cd octave-*
 ./autogen.sh
-./configure --prefix=$out --disable-readline
+./configure --prefix=$out --enable-readline
 make
 make install
 #strip -S $out/lib/*/*.a
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index a6057812a1b..2af8e7e8a11 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, autoconf, g77, texinfo, bison, flex, gperf }:
+{ stdenv, fetchurl, autoconf, g77, texinfo, bison, flex, gperf, readline, ncurses}:
 
 assert autoconf != null && texinfo != null
-  && bison != null && flex != null && gperf != null;
+  && bison != null && flex != null && gperf != null && readline != null && ncurses != null ;
 assert g77.langF77;
 
 stdenv.mkDerivation {
@@ -11,5 +11,6 @@ stdenv.mkDerivation {
     url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.57.tar.gz ;
     md5 = "a0171814e005ce6d77365e7d831eef45";
   };
-  inherit autoconf g77 texinfo bison flex gperf;
+  inherit autoconf g77 texinfo bison flex gperf readline;
+  buildInputs = [autoconf g77 texinfo bison flex gperf readline ncurses] ;
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index bcddd501268..0d74652d0e0 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -195,7 +195,7 @@ rec {
   };
 
   octave = (import ../development/interpreters/octave) {
-    inherit fetchurl stdenv autoconf g77 texinfo flex gperf;
+    inherit fetchurl stdenv autoconf g77 texinfo flex gperf readline ncurses;
     bison = bisonnew;
   };