diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-24 10:31:27 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-24 17:14:56 -0500 |
| commit | 5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f (patch) | |
| tree | 45a1b1f823fd07888cbcc74708e7f81e99e30f28 /pkgs/tools/graphics | |
| parent | ad49ea230a6318f4164bc4bd395018acc61cb81a (diff) | |
| download | nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.tar nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.tar.gz nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.tar.bz2 nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.tar.lz nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.tar.xz nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.tar.zst nixlib-5d1f6ad57c5f07b2ed93ad2a3196d2f43455364f.zip | |
qt5: make qt-5.4.1 default
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/kst/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f8dd35576ff7..fcd8a37382e4 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -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 [ qt ] + ++ lib.optional withQt [ qt.base ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 147206644277..01fb5d829947 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt5 gsl getdata netcdf muparser matio ]; + buildInputs = [ qt5.base gsl getdata netcdf muparser matio ]; cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; |