public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* octave uses readline

Browse Source 
svn path=/nixpkgs/trunk/; revision=1232
This commit is contained in:
Rob Vermaas 2004-08-05 15:30:06 +00:00
parent 6412b0c5f2
commit c389786b15
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/interpreters/octave/builder.sh
View File

@ -1,6 +1,5 @@
set -x set -x
buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf"
. $stdenv/setup . $stdenv/setup
g77orig=$(cat $g77/nix-support/orig-gcc) g77orig=$(cat $g77/nix-support/orig-gcc)
@ -12,7 +11,7 @@ export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
tar xvfz $src tar xvfz $src
cd octave-* cd octave-*
./autogen.sh ./autogen.sh
./configure --prefix=$out --disable-readline ./configure --prefix=$out --enable-readline
make make
make install make install
#strip -S $out/lib/*/*.a #strip -S $out/lib/*/*.a

7
pkgs/development/interpreters/octave/default.nix
View File

@ -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 assert autoconf != null && texinfo != null
&& bison != null && flex != null && gperf != null; && bison != null && flex != null && gperf != null && readline != null && ncurses != null ;
assert g77.langF77; assert g77.langF77;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,5 +11,6 @@ stdenv.mkDerivation {
url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.57.tar.gz ; url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.57.tar.gz ;
md5 = "a0171814e005ce6d77365e7d831eef45"; 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] ;
} }

2
pkgs/system/all-packages-generic.nix
View File

@ -195,7 +195,7 @@ rec {
}; };
octave = (import ../development/interpreters/octave) { 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; bison = bisonnew;
}; };