nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnuplot: Allow compiling with libcaca (#137523)

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Michal Sojka 2021-09-12 16:00:55 +02:00 committed by GitHub
parent b040385412
commit 7f22c1851f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
, cairo, gd, libcerf, pango, readline, zlib , cairo, gd, libcerf, pango, readline, zlib
, withTeXLive ? false, texlive , withTeXLive ? false, texlive
, withLua ? false, lua , withLua ? false, lua
, withCaca ? false, libcaca
, libX11 ? null , libX11 ? null
, libXt ? null , libXt ? null
, libXpm ? null , libXpm ? null
@ -33,6 +34,7 @@ in
[ cairo gd libcerf pango readline zlib ] [ cairo gd libcerf pango readline zlib ]
++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; })
++ lib.optional withLua lua ++ lib.optional withLua lua
++ lib.optional withCaca libcaca
++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optionals withQt [ qtbase qtsvg ] ++ lib.optionals withQt [ qtbase qtsvg ]
++ lib.optional withWxGTK wxGTK; ++ lib.optional withWxGTK wxGTK;
@ -46,7 +48,7 @@ in
(if withX then "--with-x" else "--without-x") (if withX then "--with-x" else "--without-x")
(if withQt then "--with-qt=qt5" else "--without-qt") (if withQt then "--with-qt=qt5" else "--without-qt")
(if aquaterm then "--with-aquaterm" else "--without-aquaterm") (if aquaterm then "--with-aquaterm" else "--without-aquaterm")
]; ] ++ lib.optional withCaca "--with-caca";
CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11";