mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 13:57:10 +03:00
Merge pull request #28480 from ilpianista/qt5
qt5: Add qtnetworkauth submodule
This commit is contained in:
commit
1e9edbf6ee
@ -82,6 +82,7 @@ let
|
|||||||
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
||||||
inherit gstreamer gst-plugins-base;
|
inherit gstreamer gst-plugins-base;
|
||||||
};
|
};
|
||||||
|
qtnetworkauth = callPackage ./qtnetworkauth.nix {};
|
||||||
qtquick1 = null;
|
qtquick1 = null;
|
||||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||||
@ -102,9 +103,9 @@ let
|
|||||||
env = callPackage ../qt-env.nix {};
|
env = callPackage ../qt-env.nix {};
|
||||||
full = env "qt-${qtbase.version}" ([
|
full = env "qt-${qtbase.version}" ([
|
||||||
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
||||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
|
qtimageformats qtlocation qtmultimedia qtnetworkauth qtquickcontrols
|
||||||
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
|
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||||
qtx11extras qtxmlpatterns
|
qtwebsockets qtx11extras qtxmlpatterns
|
||||||
] ++ optional (!stdenv.isDarwin) qtwayland
|
] ++ optional (!stdenv.isDarwin) qtwayland
|
||||||
++ optional (stdenv.isDarwin) qtmacextras);
|
++ optional (stdenv.isDarwin) qtmacextras);
|
||||||
|
|
||||||
|
7
pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix
Normal file
7
pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{ qtSubmodule, qtbase }:
|
||||||
|
|
||||||
|
qtSubmodule {
|
||||||
|
name = "qtnetworkauth";
|
||||||
|
qtInputs = [ qtbase ];
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user