pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #31528 from NixOS/revert-28480-qt5

Revert "qt5: Add qtnetworkauth submodule"

authored by Peter Simons and committed by GitHub 5e94dc88 c6d9b5d9

+3 -11
unified split
+3 -4
pkgs/development/libraries/qt-5/5.9/default.nix
··· 82 82 qtmultimedia = callPackage ../modules/qtmultimedia.nix { 83 83 inherit gstreamer gst-plugins-base; 84 84 }; 85 - qtnetworkauth = callPackage ./qtnetworkauth.nix {}; 86 85 qtquick1 = null; 87 86 qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; 88 87 qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; ··· 103 102 env = callPackage ../qt-env.nix {}; 104 103 full = env "qt-${qtbase.version}" ([ 105 104 qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects 106 - qtimageformats qtlocation qtmultimedia qtnetworkauth qtquickcontrols 107 - qtscript qtsensors qtserialport qtsvg qttools qttranslations 108 - qtwebsockets qtx11extras qtxmlpatterns 105 + qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript 106 + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets 107 + qtx11extras qtxmlpatterns 109 108 ] ++ optional (!stdenv.isDarwin) qtwayland 110 109 ++ optional (stdenv.isDarwin) qtmacextras); 111 110
-7
pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix
··· 1 - { qtSubmodule, qtbase }: 2 - 3 - qtSubmodule { 4 - name = "qtnetworkauth"; 5 - qtInputs = [ qtbase ]; 6 - outputs = [ "out" "dev" ]; 7 - }