public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75134 from andersk/gnuplot_qt

Browse Source 
gnuplot_qt: Use qt mkDerivation
This commit is contained in:
worldofpeace 2019-12-07 05:50:48 -05:00 committed by GitHub
commit 4d9ccae632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,14 +11,14 @@
, fontconfig ? null , fontconfig ? null
, gnused ? null , gnused ? null
, coreutils ? null , coreutils ? null
, withQt ? false, qttools, qtbase, qtsvg , withQt ? false, mkDerivation, qttools, qtbase, qtsvg
}: }:
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let let
withX = libX11 != null && !aquaterm && !stdenv.isDarwin; withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
in in
stdenv.mkDerivation rec { (if withQt then mkDerivation else stdenv.mkDerivation) rec {
name = "gnuplot-5.2.7"; name = "gnuplot-5.2.7";
src = fetchurl { src = fetchurl {