From 7f22c1851fd1baa3b9149f3b6202f6350324e943 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 12 Sep 2021 16:00:55 +0200 Subject: [PATCH] gnuplot: Allow compiling with libcaca (#137523) Co-authored-by: Sandro --- pkgs/tools/graphics/gnuplot/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index b46fd88ab99d..741468dfd994 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -2,6 +2,7 @@ , cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua +, withCaca ? false, libcaca , libX11 ? null , libXt ? null , libXpm ? null @@ -33,6 +34,7 @@ in [ cairo gd libcerf pango readline zlib ] ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua + ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withQt [ qtbase qtsvg ] ++ lib.optional withWxGTK wxGTK; @@ -46,7 +48,7 @@ in (if withX then "--with-x" else "--without-x") (if withQt then "--with-qt=qt5" else "--without-qt") (if aquaterm then "--with-aquaterm" else "--without-aquaterm") - ]; + ] ++ lib.optional withCaca "--with-caca"; CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11";