Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unbreak qt5.full, add qt3d, qtgamepad, qtremoteobjects #102490

Closed
wants to merge 4 commits into from
Closed

Unbreak qt5.full, add qt3d, qtgamepad, qtremoteobjects #102490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e3069a
qt5.full: Add all shared objects
Lucus16 Nov 2, 2020
d1a08b3
qt5: Add qt3d, qtgamepad, qtremoteobjects
Lucus16 Nov 2, 2020
a9953c0
kdeApplications: remove qtwebkit dependency
Lucus16 Nov 6, 2020
2f31938
calligra: remove overrides
Lucus16 Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkgs/development/libraries/qt-5/5.12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ let
inherit developerBuild decryptSslTraffic;
};

qt3d = callPackage ../modules/qt3d.nix {};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
Expand All @@ -177,6 +178,7 @@ let
qtquick1 = null;
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {};
qtscript = callPackage ../modules/qtscript.nix {};
qtsensors = callPackage ../modules/qtsensors.nix {};
qtserialbus = callPackage ../modules/qtserialbus.nix {};
Expand All @@ -199,11 +201,11 @@ let

env = callPackage ../qt-env.nix {};
full = env "qt-full-${qtbase.version}" ([
qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
qtscript qtsensors qtserialport qtsvg qttools qttranslations
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
qtwebview qtx11extras qtxmlpatterns
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad
qtgraphicaleffects qtimageformats qtlocation qtmultimedia
qtquickcontrols qtquickcontrols2 qtremoteobjects qtscript qtsensors
qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel
qtwebengine qtwebkit qtwebsockets qtwebview qtx11extras qtxmlpatterns
Comment on lines -202 to +208
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It'd be nice if the diff was cleaner and would only include the added modules.

] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);

Expand Down
13 changes: 8 additions & 5 deletions pkgs/development/libraries/qt-5/5.14/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@ let
inherit developerBuild decryptSslTraffic;
};

qt3d = callPackage ../modules/qt3d.nix {};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgamepad = callPackage ../modules/qtgamepad.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
Expand All @@ -150,6 +152,7 @@ let
qtquick1 = null;
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {};
qtscript = callPackage ../modules/qtscript.nix {};
qtsensors = callPackage ../modules/qtsensors.nix {};
qtserialport = callPackage ../modules/qtserialport.nix {};
Expand All @@ -171,11 +174,11 @@ let

env = callPackage ../qt-env.nix {};
full = env "qt-full-${qtbase.version}" ([
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
qtscript qtsensors qtserialport qtsvg qttools qttranslations
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
qtwebview qtx11extras qtxmlpatterns
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad
qtgraphicaleffects qtimageformats qtlocation qtmultimedia
qtquickcontrols qtquickcontrols2 qtremoteobjects qtscript qtsensors
qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel
qtwebengine qtwebkit qtwebsockets qtwebview qtx11extras qtxmlpatterns
] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);

Expand Down
13 changes: 8 additions & 5 deletions pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,12 @@ let
inherit developerBuild decryptSslTraffic;
};

qt3d = callPackage ../modules/qt3d.nix {};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgamepad = callPackage ../modules/qtgamepad.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
Expand All @@ -147,6 +149,7 @@ let
qtquick1 = null;
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {};
qtscript = callPackage ../modules/qtscript.nix {};
qtsensors = callPackage ../modules/qtsensors.nix {};
qtserialport = callPackage ../modules/qtserialport.nix {};
Expand All @@ -168,11 +171,11 @@ let

env = callPackage ../qt-env.nix {};
full = env "qt-full-${qtbase.version}" ([
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
qtscript qtsensors qtserialport qtsvg qttools qttranslations
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
qtwebview qtx11extras qtxmlpatterns
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad
qtgraphicaleffects qtimageformats qtlocation qtmultimedia
qtquickcontrols qtquickcontrols2 qtremoteobjects qtscript qtsensors
qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel
qtwebengine qtwebkit qtwebsockets qtwebview qtx11extras qtxmlpatterns
] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);

Expand Down
7 changes: 7 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qt3d.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:

qtModule {
name = "qt3d";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
7 changes: 7 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:

qtModule {
name = "qtremoteobjects";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" ];
}