kst: Qt 5 infrastructure update

This commit is contained in:
Thomas Tuegel 2015-12-19 20:48:36 -06:00
parent 541b2f20de
commit 97f7eb1e64
2 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig
, qt5, gsl, getdata, netcdf, muparser, matio , qtbase, gsl, getdata, netcdf, muparser, matio
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "Kst-2.0.8"; name = "Kst-2.0.8";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkgconfig ]; 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"; cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1";

View File

@ -2015,7 +2015,7 @@ let
kpcli = callPackage ../tools/security/kpcli { }; 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 { }; leocad = callPackage ../applications/graphics/leocad { };