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

* octave: 2.9.0 needs flex anyway

Browse Source 
svn path=/nixpkgs/trunk/; revision=2425
This commit is contained in:
Rob Vermaas 2005-03-16 15:13:30 +00:00
parent cae1a161e2
commit c517847eab
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{stdenv, fetchurl, g77, readline, ncurses, perl}: {stdenv, fetchurl, g77, readline, ncurses, perl, flex}:
assert readline != null && ncurses != null; assert readline != null && ncurses != null && flex != null;
assert g77.langF77; assert g77.langF77;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,6 +9,6 @@ stdenv.mkDerivation {
url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.0.tar.bz2; url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.0.tar.bz2;
md5 = "687a09033bc68f09810e947010bc8f29"; md5 = "687a09033bc68f09810e947010bc8f29";
}; };
buildInputs = [g77 readline ncurses perl]; buildInputs = [g77 readline ncurses perl flex];
configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
} }

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

@ -182,6 +182,9 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
mjpegtools = (import ../tools/video/mjpegtools) {
inherit fetchurl stdenv;
};
### SHELLS ### SHELLS
@ -262,7 +265,7 @@ rec {
}; };
octave = (import ../development/interpreters/octave) { octave = (import ../development/interpreters/octave) {
inherit fetchurl stdenv readline ncurses g77 perl; inherit fetchurl stdenv readline ncurses g77 perl flex;
}; };
gnumake = (import ../development/tools/build-managers/gnumake) { gnumake = (import ../development/tools/build-managers/gnumake) {