public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 8ace098f43 3d0e582b38
commit c78f9ad2f9
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.6/default.nix
View File

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

7
pkgs/development/libraries/qt-5/5.6/qtwebchannel.nix Normal file
View File

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

6
pkgs/development/libraries/qt-5/5.6/qtwebengine.nix Normal file
View File

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