gnuplot: use texlive-new

This commit is contained in:
Thomas Tuegel 2015-12-12 10:47:03 -06:00
parent 08d842ea09
commit 269ae2e29d

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline { lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline
, withTeXLive ? false, texLive , withTeXLive ? false, texlive
, withLua ? false, lua , withLua ? false, lua
, emacs ? null , emacs ? null
, libX11 ? null , libX11 ? null
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ] [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ]
++ lib.optional withTeXLive texLive ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; })
++ lib.optional withLua lua ++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optional withQt [ qt ] ++ lib.optional withQt [ qt ]