From 99d499f0c8a4992125d7379ff25be544cf8aa241 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Aug 2007 15:11:48 +0000 Subject: [PATCH] Added X11 option for gnuplot. svn path=/nixpkgs/trunk/; revision=9046 --- pkgs/tools/graphics/gnuplot/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index a0b290878ba..c73d36d8d71 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,14 @@ -{stdenv, fetchurl, zlib, libpng, texinfo}: +{stdenv, fetchurl, zlib, libpng, texinfo, + libX11 ? null, + libXt ? null, + libXpm ? null, + libXaw ? null, + x11Support ? false +}: + +assert x11Support -> ((libX11 != null) && + (libXt != null) && (libXpm != null) && + (libXaw != null)); stdenv.mkDerivation { # Gnuplot (which isn't open source) has a license that requires that @@ -13,7 +23,8 @@ stdenv.mkDerivation { md5 = "66258443d9f93cc4f46b147dac33e63a"; }; - configureFlags = ["--without-x"]; + configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; - buildInputs = [zlib libpng texinfo]; + buildInputs = [zlib libpng texinfo] ++ + (if x11Support then [libX11 libXt libXpm libXaw] else []); }