diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-09-09 05:14:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-09 05:14:21 -0500 |
commit | 959c0bf468269b83535cb450fa951befcf166c4a (patch) | |
tree | 0d3896c631ba42dac5a9e220c3d5a230af6462c6 | |
parent | 309d47a21bbe059d8ecb6034f87806bac1e739ac (diff) | |
parent | 812b60b175f5d02adc1310b52439b5bbb35dabc6 (diff) | |
download | nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.tar nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.tar.gz nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.tar.bz2 nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.tar.lz nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.tar.xz nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.tar.zst nixpkgs-959c0bf468269b83535cb450fa951befcf166c4a.zip |
Merge pull request #97456 from ttuegel/master--plasma5-no-qt-5.15
Remove Qt 5.15 from the Plasma 5 closure
-rw-r--r-- | nixos/modules/security/pam.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index ce74805ef41..4141a17c507 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -394,7 +394,7 @@ let "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.googleAuthenticator.enable @@ -471,7 +471,7 @@ let "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 869adee5552..94bc2ae491b 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,8 +7,9 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5; + inherit (pkgs) kdeApplications kdeFrameworks plasma5; libsForQt5 = pkgs.libsForQt514; + qt5 = pkgs.qt514; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; @@ -84,7 +85,7 @@ let # recognize that software that has been removed. rm -fv $HOME/.cache/ksycoca* - ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 + ${libsForQt5.kservice}/bin/kbuildsycoca5 ''; set_XDG_CONFIG_HOME = '' @@ -204,7 +205,9 @@ in KERNEL=="i2c-[0-9]*", TAG+="uaccess" ''; - environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; + environment.systemPackages = + with qt5; with libsForQt5; + with plasma5; with kdeApplications; with kdeFrameworks; [ frameworkintegration kactivities @@ -294,7 +297,7 @@ in qtvirtualkeyboard - xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ] # Phonon audio backend diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c8fa56992..165b9f2bcdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23095,7 +23095,7 @@ in robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; + sddm = libsForQt514.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; |