diff options
| author | K900 <me@0upti.me> | 2023-11-04 19:08:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 19:08:55 +0300 |
| commit | ea9372de82146318a46340c96b9a4e493f4e2832 (patch) | |
| tree | 9b9f97a9f1a7279fc8e088cad1d9c59cac5aa01a | |
| parent | c526304148df4dd5f41c79b79ebd49b31260d1fa (diff) | |
| parent | dee9519abe3a91417886cb912a50b3ad43bd7d67 (diff) | |
| download | nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.tar nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.tar.gz nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.tar.bz2 nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.tar.lz nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.tar.xz nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.tar.zst nixpkgs-ea9372de82146318a46340c96b9a4e493f4e2832.zip | |
Merge pull request #265482 from alois31/plasma-setuid
nixos/plasma5: fix mismatch between nix and module system
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index fc328704571..361dbe879a1 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -29,7 +29,7 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; inherit (lib) - getBin optionalString literalExpression + getBin optionalAttrs optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; @@ -178,7 +178,7 @@ in capabilities = "cap_sys_nice+ep"; source = "${getBin plasma5.kwin}/bin/kwin_wayland"; }; - } // mkIf (!cfg.runUsingSystemd) { + } // optionalAttrs (!cfg.runUsingSystemd) { start_kdeinit = { setuid = true; owner = "root"; |