diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-08-08 06:48:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 06:48:25 -0500 |
| commit | ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa (patch) | |
| tree | bc6b24499cd68d3b28ec630f9769a80f899ad9c1 /pkgs/development/libraries | |
| parent | 39b5cd5f6d52e4924a4e48a9789a48a729d84aad (diff) | |
| parent | 5abfed0e0bfb260c005191563ecac1278b9df7ec (diff) | |
| download | nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.tar nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.tar.gz nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.tar.bz2 nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.tar.lz nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.tar.xz nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.tar.zst nixlib-ca6f1591ba5b9db9cf9e04a10f3c500afdc1defa.zip | |
Merge pull request #27013 from expipiplus1/qt-charts
qt5: Add qtcharts submodule
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/qtcharts.nix | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 7aba54fb883b..8f9be38fc882 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -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); diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix new file mode 100644 index 000000000000..46713eb7a9e7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtcharts"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtQmlPrefix" "$bin" + ''; +} |