Merge pull request #27013 from expipiplus1/qt-charts

qt5: Add qtcharts submodule
This commit is contained in:
Thomas Tuegel 2017-08-08 06:48:25 -05:00 committed by GitHub
commit ca6f1591ba
2 changed files with 14 additions and 3 deletions

@ -99,6 +99,7 @@ let
inherit developerBuild decryptSslTraffic;
};
qtcharts = callPackage ./qtcharts.nix {};
qtconnectivity = callPackage ./qtconnectivity.nix {};
qtdeclarative = callPackage ./qtdeclarative {};
qtdoc = callPackage ./qtdoc.nix {};
@ -128,10 +129,10 @@ let
env = callPackage ../qt-env.nix {};
full = env "qt-${qtbase.version}" ([
qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations
qtwebsockets qtx11extras qtxmlpatterns
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
qtx11extras qtxmlpatterns
] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);

@ -0,0 +1,10 @@
{ qtSubmodule, qtbase }:
qtSubmodule {
name = "qtcharts";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';
}