diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2014-07-23 18:01:31 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2014-07-23 18:01:31 -0500 |
commit | ac01b79c73f6430f0601fd6665bc46a0408f1009 (patch) | |
tree | 74ce3d7f7d438e1d5f01c9decc74418d50553ef5 /pkgs | |
parent | 760cad296ddb3c9288bb1d823b569c6821ad0a2d (diff) | |
download | nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.tar nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.tar.gz nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.tar.bz2 nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.tar.lz nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.tar.xz nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.tar.zst nixlib-ac01b79c73f6430f0601fd6665bc46a0408f1009.zip |
gnuplot: add optional Qt terminal
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 3eb253017ad5..58e023a6aaa7 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -13,11 +13,13 @@ , pkgconfig ? null , fontconfig ? null , gnused ? null -, coreutils ? null }: +, coreutils ? null +, qt ? null }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let withX = libX11 != null && !aquaterm; + withQt = qt != null; in stdenv.mkDerivation rec { name = "gnuplot-4.6.5"; @@ -31,11 +33,13 @@ stdenv.mkDerivation rec { [ zlib gd texinfo readline emacs lua texLive pango cairo pkgconfig makeWrapper ] ++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ] + ++ stdenv.lib.optional withQt [ qt ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; configureFlags = (if withX then ["--with-x"] else ["--without-x"]) + ++ (if withQt then ["--enable-qt"] else ["--disable-qt"]) ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]) ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c255103bb01..a9344b3be1fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1156,6 +1156,8 @@ let else stdenv; }; + gnuplot_qt = gnuplot.override { qt = qt4; }; + # must have AquaTerm installed separately gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; |