From 8393b93136d5c2e4f69bc00d7239957f451d0571 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 24 Jul 2009 14:18:25 +0000 Subject: [PATCH] pass readline to gnuplot svn path=/nixpkgs/trunk/; revision=16455 --- pkgs/tools/graphics/gnuplot/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index b77c795c2de1..0ff18685ef99 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -4,6 +4,7 @@ , libXpm ? null , libXaw ? null , x11Support ? false +, readline }: assert x11Support -> ((libX11 != null) && @@ -24,6 +25,6 @@ stdenv.mkDerivation { 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 []); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c3936c02576..c4a43474e7ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -764,11 +764,11 @@ let }; gnuplot = import ../tools/graphics/gnuplot { - inherit fetchurl stdenv zlib gd texinfo; + inherit fetchurl stdenv zlib gd texinfo readline; }; gnuplotX = import ../tools/graphics/gnuplot { - inherit fetchurl stdenv zlib gd texinfo; + inherit fetchurl stdenv zlib gd texinfo readline; inherit (xlibs) libX11 libXt libXaw libXpm; x11Support = true; };