From 97f7eb1e640bbb3c8d861badc462f8b48c79dd5d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:48:36 -0600 Subject: [PATCH] kst: Qt 5 infrastructure update --- pkgs/tools/graphics/kst/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 01fb5d82994..9b983450f48 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, qt5, gsl, getdata, netcdf, muparser, matio +, qtbase, gsl, getdata, netcdf, muparser, matio }: stdenv.mkDerivation rec { name = "Kst-2.0.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt5.base gsl getdata netcdf muparser matio ]; + buildInputs = [ qtbase gsl getdata netcdf muparser matio ]; cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca78f8bd637..3130e821bf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2015,7 +2015,7 @@ let kpcli = callPackage ../tools/security/kpcli { }; - kst = callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; leocad = callPackage ../applications/graphics/leocad { };