octave wants x11 (I reported this to octave as a bug).

Maybe it got in from their recent fltk/gl attempts to make their own plotter.

svn path=/nixpkgs/trunk/; revision=20017
This commit is contained in:
Lluís Batlle i Rossell 2010-02-15 17:10:25 +00:00
parent e9ad76a2ff
commit 6c622c014d
2 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull}: {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
libX11}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "octave-3.2.4"; name = "octave-3.2.4";
@ -6,6 +7,6 @@ stdenv.mkDerivation {
url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2; url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8"; sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
}; };
buildInputs = [gfortran readline ncurses perl flex texinfo qhull]; buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11];
configureFlags = "--enable-readline --enable-dl"; configureFlags = "--enable-readline --enable-dl";
} }

View File

@ -2517,6 +2517,7 @@ let
octave = import ../development/interpreters/octave { octave = import ../development/interpreters/octave {
inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo; inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo;
inherit (xlibs) libX11;
}; };
# mercurial (hg) bleeding edge version # mercurial (hg) bleeding edge version