qwt: Qt 5 infrastructure update

This commit is contained in:
Thomas Tuegel 2015-12-19 20:09:59 -06:00
parent 9a91200e9e
commit ad9ece4f92
2 changed files with 5 additions and 4 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt5 }:
{ stdenv, fetchurl, qtbase, qtsvg, qttools }:
stdenv.mkDerivation rec {
name = "qwt-6.1.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";
};
propagatedBuildInputs = [ qt5.base qt5.svg qt5.tools ];
propagatedBuildInputs = [ qtbase qtsvg qttools ];
postPatch = ''
sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri

View file

@ -8183,6 +8183,8 @@ let
qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
qwt = callPackage ../development/libraries/qwt/6.nix { };
signon = callPackage ../development/libraries/signon { };
telepathy = callPackage ../development/libraries/telepathy/qt { };
@ -8213,8 +8215,6 @@ let
qwt = callPackage ../development/libraries/qwt {};
qwt6 = callPackage ../development/libraries/qwt/6.nix { };
qxt = callPackage ../development/libraries/qxt {};
rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
@ -15809,6 +15809,7 @@ aliases = with self; rec {
quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30
quassel_kf5 = kde5.quassel; # added 2015-09-30
quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30
qwt6 = qt5.qwt; # added 2015-12-19
rdiff_backup = rdiff-backup; # added 2014-11-23
rssglx = rss-glx; #added 2015-03-25
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02