diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/tools/graphics/gnuplot/default.nix | |
parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/tools/graphics/gnuplot/default.nix')
-rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index e0f9ce2a2bf7..58e023a6aaa7 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -13,29 +13,33 @@ , 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.3"; + name = "gnuplot-4.6.5"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; + sha256 = "0bcsa5b33msddjs6mj0rhi81cs19h9p3ykixkkl70ifhqwqg0l75"; }; buildInputs = [ 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"]) ; |