git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #97456 from ttuegel/master--plasma5-no-qt-5.15

Remove Qt 5.15 from the Plasma 5 closure

commit959c0bf468269b83535cb450fa951befcf166c4a authorThomas Tuegel <ttuegel@mailbox.org> dateWed 9 Sep 2020, 05:14 (6 years ago) parent309d47a812b60b
3 files changed+10−7
nixos/modules/security/pam.nix+2−2 nixos/modules/services/x11/desktop-managers/plasma5.nix+7−4 pkgs/top-level/all-packages.nix+1−1
nixos/modules/security/pam.nix+2−2
@@ -394,7 +394,7 @@ let
394394 "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
395395 ${optionalString cfg.enableKwallet
396396 ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
397− " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
397+ " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")}
398398 ${optionalString cfg.enableGnomeKeyring
399399 "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"}
400400 ${optionalString cfg.googleAuthenticator.enable
@@ -471,7 +471,7 @@ let
471471 "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
472472 ${optionalString (cfg.enableKwallet)
473473 ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
474− " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
474+ " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")}
475475 ${optionalString (cfg.enableGnomeKeyring)
476476 "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
477477 ${optionalString (config.virtualisation.lxc.lxcfs.enable)
nixos/modules/services/x11/desktop-managers/plasma5.nix+7−4
@@ -7,8 +7,9 @@ let
77 xcfg = config.services.xserver;
88 cfg = xcfg.desktopManager.plasma5;
99
10− inherit (pkgs) kdeApplications plasma5;
10+ inherit (pkgs) kdeApplications kdeFrameworks plasma5;
1111 libsForQt5 = pkgs.libsForQt514;
12+ qt5 = pkgs.qt514;
1213 inherit (pkgs) writeText;
1314
1415 pulseaudio = config.hardware.pulseaudio;
@@ -84,7 +85,7 @@ let
8485 # recognize that software that has been removed.
8586 rm -fv $HOME/.cache/ksycoca*
8687
87− ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5
88+ ${libsForQt5.kservice}/bin/kbuildsycoca5
8889 '';
8990
9091 set_XDG_CONFIG_HOME = ''
@@ -204,7 +205,9 @@ in
204205 KERNEL=="i2c-[0-9]*", TAG+="uaccess"
205206 '';
206207
207− environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
208+ environment.systemPackages =
209+ with qt5; with libsForQt5;
210+ with plasma5; with kdeApplications; with kdeFrameworks;
208211 [
209212 frameworkintegration
210213 kactivities
@@ -294,7 +297,7 @@ in
294297
295298 qtvirtualkeyboard
296299
297− xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
300+ pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
298301 ]
299302
300303 # Phonon audio backend
pkgs/top-level/all-packages.nix+1−1
@@ -23095,7 +23095,7 @@ in
2309523095
2309623096 robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
2309723097
23098− sddm = libsForQt5.callPackage ../applications/display-managers/sddm { };
23098+ sddm = libsForQt514.callPackage ../applications/display-managers/sddm { };
2309923099
2310023100 skrooge = libsForQt514.callPackage ../applications/office/skrooge {};
2310123101