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

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

Browse Source 
Revert "qt5: Add qtnetworkauth submodule"
This commit is contained in:
Peter Simons 2017-11-11 17:54:42 +01:00 committed by GitHub
commit 5e94dc882b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 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,7 +82,6 @@ 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 {};
@ -103,9 +102,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 qtnetworkauth qtquickcontrols qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtscript qtsensors qtserialport qtsvg qttools qttranslations qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
qtwebsockets qtx11extras qtxmlpatterns 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
View File

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