diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-11-11 08:25:10 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 08:25:10 -0600 |
| commit | 1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270 (patch) | |
| tree | ea2518f704a197ac1bcabf76f4cb00a7718d6a92 /pkgs/development/libraries/qt-5 | |
| parent | 27e32aa357b9d66fdb6cd6d12c2f9ed026aff139 (diff) | |
| parent | ab1075c0d5df8a4656b651d6c2c5f9da14bc2723 (diff) | |
| download | nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.tar nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.tar.gz nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.tar.bz2 nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.tar.lz nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.tar.xz nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.tar.zst nixpkgs-1e9edbf6eea7de28c776d6d2cbae53bdbdc3c270.zip | |
Merge pull request #28480 from ilpianista/qt5
qt5: Add qtnetworkauth submodule
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 879f7f198c9..5394693af11 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -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); diff --git a/pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix new file mode 100644 index 00000000000..019654ad5c0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtnetworkauth"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; +} |