Merge pull request #75134 from andersk/gnuplot_qt

gnuplot_qt: Use qt mkDerivation
2019-12-07 05:50:48 -05:00
parent b205ac101a c55f48477a
commit 4d9ccae632
1 changed files with 2 additions and 2 deletions
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -11,14 +11,14 @@
 , fontconfig ? null
 , gnused ? null
 , coreutils ? null
-, withQt ? false, qttools, qtbase, qtsvg
+, withQt ? false, mkDerivation, qttools, qtbase, qtsvg
 }:

 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
 let
  withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
-stdenv.mkDerivation rec {
+(if withQt then mkDerivation else stdenv.mkDerivation) rec {
  name = "gnuplot-5.2.7";

  src = fetchurl {