From 6c622c014dc3af58a8ea6a1810ffb8d507c9ac25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 15 Feb 2010 17:10:25 +0000 Subject: [PATCH] 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 --- pkgs/development/interpreters/octave/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 5ac14a36282..ea095706b22 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -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 { name = "octave-3.2.4"; @@ -6,6 +7,6 @@ stdenv.mkDerivation { url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2; sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8"; }; - buildInputs = [gfortran readline ncurses perl flex texinfo qhull]; + buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11]; configureFlags = "--enable-readline --enable-dl"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 275abfcd1c4..1bc3b90cae3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2517,6 +2517,7 @@ let octave = import ../development/interpreters/octave { inherit stdenv fetchurl gfortran readline ncurses perl flex qhull texinfo; + inherit (xlibs) libX11; }; # mercurial (hg) bleeding edge version