aboutsummaryrefslogtreecommitdiff
path: root/pkgs/top-level/aliases.nix
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-10-30 20:32:19 +0200
committerDoron Behar <doron.behar@gmail.com>2020-10-30 20:32:19 +0200
commitb5c6505e63d800d044923d7c8459cd085cd16a49 (patch)
treef8e4bbe6f86a4190bacc39885177245353918f03 /pkgs/top-level/aliases.nix
parent2df527228f83d502a6a59d8d22200b1ef269cf41 (diff)
treewide: Safer libsForQt5.callPackage
Intro: Part of #101369: Every attribute from kdeApplications and kdeFrameworks can be built with a few different qt5 versions. It's hard to tell the difference between an application and a library and some applications rely on inputs from kdeApplications and libsForQt5 alike. Before this change, some applications that were defined with `libsForQt5.callPackage` used libraries from the kde* sets compiled with a specific qt5 version, Due to `inherit (kde*) <lib or app>;` used in the widest scope, we had issues with packages that depended on packages defined by this `inherit`. This led to mismatched qt versions used in the same inputs, or the inputs of inputs etc. Hence, we added to all libsForQt5* sets, packages that will be used from the correct libsForQt5 set, in accordance to the `libsForQt5*.callPackage` used. All `inherit (kdeApplications) <pkgs>` and similar inheritance was moved out of all-packages.nix to aliases.nix only for backwards compatibility. Now some KDE applications show up in the attribute sets `libsForQt5*` which didn't show up there previously. This is sort of misleading, as these are not necessary libraries, but they show up in the wider scope thanks to them in aliases.nix. Hence it's the best that can be done considering the circumstances and the urgency of the issue.
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r--pkgs/top-level/aliases.nix53
1 files changed, 53 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eeb5519233ce..50aa36745ddc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -750,4 +750,57 @@ mapAliases ({
ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
+ /* If these are in the scope of all-packages.nix, they cause collisions
+ between mixed versions of qt. See:
+ https://github.com/NixOS/nixpkgs/pull/101369 */
+
+ inherit (kdeFrameworks) breeze-icons oxygen-icons5;
+ inherit (kdeApplications)
+ akonadi akregator ark
+ bomber bovo
+ dolphin dragon
+ elisa
+ ffmpegthumbs filelight
+ granatier gwenview
+ k3b
+ kaddressbook kalzium kapptemplate kapman kate katomic
+ kblackbox kblocks kbounce
+ kcachegrind kcalc kcharselect kcolorchooser
+ kdenlive kdf kdialog kdiamond
+ keditbookmarks
+ kfind kfloppy
+ kget kgpg
+ khelpcenter
+ kig kigo killbots kitinerary
+ kleopatra klettres klines
+ kmag kmail kmines kmix kmplot
+ knavalbattle knetwalk knights
+ kollision kolourpaint kompare konsole kontact korganizer
+ kpkpass
+ krdc kreversi krfb
+ kshisen ksquares ksystemlog
+ kteatime ktimer ktouch kturtle
+ kwalletmanager kwave
+ marble minuet
+ okular
+ picmi
+ spectacle
+ yakuake
+ ;
+ inherit (plasma5)
+ bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
+ kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
+ kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
+ kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
+ plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
+ plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
+ systemsettings user-manager xdg-desktop-portal-kde
+ ;
+ inherit (plasma5.thirdParty)
+ plasma-applet-caffeine-plus
+ kwin-dynamic-workspaces
+ kwin-tiling
+ krohnkite
+ ;
+
})