Merge pull request #28480 from ilpianista/qt5

qt5: Add qtnetworkauth submodule
This commit is contained in:
Thomas Tuegel
2017-11-11 08:25:10 -06:00
committed by GitHub
2 changed files with 11 additions and 3 deletions

View File

@@ -82,6 +82,7 @@ let
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
qtnetworkauth = callPackage ./qtnetworkauth.nix {};
qtquick1 = null;
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
@@ -102,9 +103,9 @@ let
env = callPackage ../qt-env.nix {};
full = env "qt-${qtbase.version}" ([
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
qtx11extras qtxmlpatterns
qtimageformats qtlocation qtmultimedia qtnetworkauth qtquickcontrols
qtscript qtsensors qtserialport qtsvg qttools qttranslations
qtwebsockets qtx11extras qtxmlpatterns
] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);

View File

@@ -0,0 +1,7 @@
{ qtSubmodule, qtbase }:
qtSubmodule {
name = "qtnetworkauth";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" ];
}