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

pass readline to gnuplot

Browse Source 
svn path=/nixpkgs/trunk/; revision=16455
This commit is contained in:
Rob Vermaas 2009-07-24 14:18:25 +00:00
parent fc6b794f33
commit 8393b93136
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/graphics/gnuplot/default.nix
View File

@ -4,6 +4,7 @@
, libXpm ? null , libXpm ? null
, libXaw ? null , libXaw ? null
, x11Support ? false , x11Support ? false
, readline
}: }:
assert x11Support -> ((libX11 != null) && assert x11Support -> ((libX11 != null) &&
@ -24,6 +25,6 @@ stdenv.mkDerivation {
configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; configureFlags = if x11Support then ["--with-x"] else ["--without-x"];
buildInputs = [zlib gd texinfo] ++ buildInputs = [zlib gd texinfo readline] ++
(if x11Support then [libX11 libXt libXpm libXaw] else []); (if x11Support then [libX11 libXt libXpm libXaw] else []);
} }

4
pkgs/top-level/all-packages.nix
View File

@ -764,11 +764,11 @@ let
}; };
gnuplot = import ../tools/graphics/gnuplot { gnuplot = import ../tools/graphics/gnuplot {
inherit fetchurl stdenv zlib gd texinfo; inherit fetchurl stdenv zlib gd texinfo readline;
}; };
gnuplotX = import ../tools/graphics/gnuplot { gnuplotX = import ../tools/graphics/gnuplot {
inherit fetchurl stdenv zlib gd texinfo; inherit fetchurl stdenv zlib gd texinfo readline;
inherit (xlibs) libX11 libXt libXaw libXpm; inherit (xlibs) libX11 libXt libXaw libXpm;
x11Support = true; x11Support = true;
}; };