ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5703 from eduarrrd/gnuplot-5

Browse Source 
gnuplot: bump to 5.0.0, allow choosing qt version
This commit is contained in:
lethalman 2015-01-19 14:50:14 +01:00
commit 3d65a59e9f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,18 +14,18 @@
, fontconfig ? null
, gnused ? null
, coreutils ? null
, withQt ? false, qt4 }:
, withQt ? false, qt }:
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let
withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
in
stdenv.mkDerivation rec {
name = "gnuplot-4.6.6";
name = "gnuplot-5.0.0";
src = fetchurl {
url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
sha256 = "0x022d7psl9g6q389x5rjlfsvfciz88yrgxg4lig4ichs1pmj68z";
sha256 = "1bqg6zbsin9w9m53rbf6adzv0j2gs66z2p5pkd060jlipk2lnza1";
};
buildInputs =
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ lib.optional withTeXLive texLive
++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optional withQt [ qt4 ]
++ lib.optional withQt [ qt ]
# compiling with wxGTK causes a malloc (double free) error on darwin
++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;

2
pkgs/top-level/all-packages.nix
View File

@ -1347,7 +1347,7 @@ let
gnupg = gnupg20;
gnuplot = callPackage ../tools/graphics/gnuplot { };
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; };
gnuplot_qt = gnuplot.override { withQt = true; };