diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 10:13:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 10:13:33 +0100 |
| commit | f29000b0023a879b42be2a8bd59136ec0c533b88 (patch) | |
| tree | 4b0b2851c7dec0588d236f6d3946b8018a74afb9 /pkgs/development/libraries/qt-5/5.9/default.nix | |
| parent | 291eac9d70e5f4b8cbbc7632afcac5ea79eb62ba (diff) | |
| parent | 76c146c99073ad27046a0a28bb3d2881486e32bb (diff) | |
| download | nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.gz nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.bz2 nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.lz nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.xz nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.tar.zst nixlib-f29000b0023a879b42be2a8bd59136ec0c533b88.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1421760
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.9/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 0582a9f3f825..7bf61c98086a 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -91,6 +91,7 @@ let qtsvg = callPackage ../modules/qtsvg.nix {}; qttools = callPackage ../modules/qttools.nix {}; qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix {}; @@ -104,7 +105,7 @@ let qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets - qtx11extras qtxmlpatterns + qtx11extras qtxmlpatterns qtvirtualkeyboard ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); |