From c1c21cde1d738fdbc330c1fc441d3ef78c92820b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 11 Nov 2017 17:53:01 +0100 Subject: [PATCH] Revert "qt5: Add qtnetworkauth submodule" --- pkgs/development/libraries/qt-5/5.9/default.nix | 7 +++---- pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix | 7 ------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix 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" ]; -}