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

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
parent 27e32aa357 ab1075c0d5
commit 1e9edbf6ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -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
View File

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