diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-07 05:50:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 05:50:48 -0500 |
| commit | 4d9ccae6324153f5fda641db6f52d8d68a4c6186 (patch) | |
| tree | deb4b4dc8ef8ca6c6121a1a1a2d5a2639a1e394c /pkgs/tools/graphics | |
| parent | b205ac101a7c98bf9a05879c9fe078f4f8460350 (diff) | |
| parent | c55f48477a4c819e02d2909e0f7dbf7218e03613 (diff) | |
| download | nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.tar nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.tar.gz nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.tar.bz2 nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.tar.lz nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.tar.xz nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.tar.zst nixpkgs-4d9ccae6324153f5fda641db6f52d8d68a4c6186.zip | |
Merge pull request #75134 from andersk/gnuplot_qt
gnuplot_qt: Use qt mkDerivation
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 7e823711e33..9f6393b6372 100644 --- 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 { |