diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 7910046d774e..5c36b735338e 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -112,6 +112,16 @@ let "pythoninterp" ]; user = [ + "qt5" + "qt5core" + "qt5dbus" + "qt5gui" + "qt5qml" + "qt5quick" + "qt5svg" + "qt5webkitwidgets" + "qt5widgets" + "qt5x11extras" "shareddesktopontologies" "sharedmimeinfo" ]; diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index de5fe5ec98d6..c9e26f7264c4 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -73,6 +73,16 @@ let "pythoninterp" ]; user = [ + "qt5" + "qt5core" + "qt5dbus" + "qt5gui" + "qt5qml" + "qt5quick" + "qt5svg" + "qt5webkitwidgets" + "qt5widgets" + "qt5x11extras" "shareddesktopontologies" "sharedmimeinfo" ]; @@ -97,9 +107,20 @@ let phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; }; + qt5 = qt5.base; + qt5core = qt5.base; + qt5dbus = qt5.base; + qt5gui = qt5.base; + qt5linguisttools = qt5.tools; + qt5qml = [qt5.declarative qt5.graphicaleffects]; + qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; qt5script = qt5.script; + qt5svg = qt5.svg; qt5tools = qt5.tools; + qt5webkitwidgets = qt5.webkit; + qt5widgets = qt5.base; qt5x11extras = qt5.x11extras; + qt5xmlpatterns = qt5.xmlpatterns; } // # packages from nixpkgs (with pkgs; { diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index b473a3453f34..d5bb3f78ce85 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -44,6 +44,16 @@ let "pythoninterp" ]; user = [ + "qt5" + "qt5core" + "qt5dbus" + "qt5gui" + "qt5qml" + "qt5quick" + "qt5svg" + "qt5webkitwidgets" + "qt5widgets" + "qt5x11extras" "shareddesktopontologies" "sharedmimeinfo" ]; @@ -84,6 +94,7 @@ let self // # packages pinned to this version of Qt 5 { + dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; }; qt5 = qt5.base; @@ -99,7 +110,6 @@ let qt5widgets = qt5.base; qt5x11extras = qt5.x11extras; qt5xmlpatterns = qt5.xmlpatterns; - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; } // # packages from the nixpkgs collection (with pkgs;