diff options
| author | Peter Simons <simons@cryp.to> | 2017-11-11 17:53:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 17:53:01 +0100 |
| commit | c1c21cde1d738fdbc330c1fc441d3ef78c92820b (patch) | |
| tree | d80ff6940a4ceb46fc41f81a812b767378b901c1 /pkgs/development/libraries/qt-5 | |
| parent | c6d9b5d96aa14855e200f5030c22a17a74559c02 (diff) | |
| download | nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.tar nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.tar.gz nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.tar.bz2 nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.tar.lz nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.tar.xz nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.tar.zst nixpkgs-c1c21cde1d738fdbc330c1fc441d3ef78c92820b.zip | |
Revert "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, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 5394693af11..879f7f198c9 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -82,7 +82,6 @@ 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 {}; @@ -103,9 +102,9 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" ([ qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtnetworkauth qtquickcontrols - qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtwebsockets qtx11extras qtxmlpatterns + qtimageformats qtlocation qtmultimedia 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 deleted file mode 100644 index 019654ad5c0..00000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtnetworkauth"; - qtInputs = [ qtbase ]; - outputs = [ "out" "dev" ]; -} |