diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2004-08-05 15:30:06 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2004-08-05 15:30:06 +0000 |
| commit | c389786b156b16c71eaf1c3294ceb6ec848e442d (patch) | |
| tree | 6501a4f7954b2a0ce237fbbeada5d0272e8c229c /pkgs/development/interpreters/octave | |
| parent | 6412b0c5f2c3f1559f598bfefeeee733c8590b7c (diff) | |
| download | nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.tar nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.tar.gz nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.tar.bz2 nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.tar.lz nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.tar.xz nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.tar.zst nixlib-c389786b156b16c71eaf1c3294ceb6ec848e442d.zip | |
* octave uses readline
svn path=/nixpkgs/trunk/; revision=1232
Diffstat (limited to 'pkgs/development/interpreters/octave')
| -rw-r--r-- | pkgs/development/interpreters/octave/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/octave/builder.sh b/pkgs/development/interpreters/octave/builder.sh index 72cbd4e5b245..244f8ef9553a 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 a6057812a1be..2af8e7e8a11e 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] ; } |