Merge pull request #16530 from vandenoever/qt56

add qtwebchannel and qtwebengine
This commit is contained in:
Thomas Tuegel 2016-06-26 17:34:42 -05:00 committed by GitHub
commit c78f9ad2f9
3 changed files with 15 additions and 2 deletions

View file

@ -95,8 +95,8 @@ let
qttools = callPackage ./qttools.nix {};
qttranslations = callPackage ./qttranslations.nix {};
/* qtwayland = not packaged */
/* qtwebchannel = not packaged */
/* qtwebengine = not packaged */
qtwebchannel = callPackage ./qtwebchannel.nix {};
qtwebengine = callPackage ./qtwebengine.nix {};
qtwebsockets = callPackage ./qtwebsockets.nix {};
/* qtwinextras = not packaged */
qtx11extras = callPackage ./qtx11extras.nix {};

View file

@ -0,0 +1,7 @@
{ qtSubmodule, qtbase, qtdeclarative }:
qtSubmodule {
name = "qtwebchannel";
qtInputs = [ qtbase qtdeclarative ];
}

View file

@ -0,0 +1,6 @@
{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }:
qtSubmodule {
name = "qtwebengine";
qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
}