diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-22 16:49:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-22 16:49:09 +0200 |
| commit | e9379f7416d04b6b7ff475816b0aa395c1e3f7f9 (patch) | |
| tree | a7da61f3fa5ed53454e210a59094a162711fcc3f /nixos | |
| parent | 253b84a1eb2609ea7d71a236040515dc7c131b1b (diff) | |
| parent | 685c34555ccd3d0eb07501783b7ca9d67e03aa18 (diff) | |
| download | nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.gz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.bz2 nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.lz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.xz nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.tar.zst nixlib-e9379f7416d04b6b7ff475816b0aa395c1e3f7f9.zip | |
Merge branch 'staging'
This includes a fix to closure-size regression that moved share/doc/*/ to share/doc/
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 24 |
2 files changed, 19 insertions, 11 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 642aedc3f242..1654d31cfeb4 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -98,9 +98,9 @@ in { package = mkOption { type = types.package; - default = pulseaudioLight; - defaultText = "pkgs.pulseaudioLight"; - example = literalExample "pkgs.pulseaudioFull"; + default = pulseaudioLight.out; + defaultText = "pkgs.pulseaudioLight.out"; + example = literalExample "pkgs.pulseaudioFull.out"; description = '' The PulseAudio derivation to use. This can be used to enable features (such as JACK support, Bluetooth) via the diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 4f74d5732af5..70dc1ac2a26a 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -62,17 +62,25 @@ in ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} - exec startkde + exec "${kde5.startkde}" + ''; }; - security.setuidOwners = singleton { - program = "kcheckpass"; - source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; - owner = "root"; - group = "root"; - setuid = true; - }; + security.setuidOwners = [ + { + program = "kcheckpass"; + source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass"; + owner = "root"; + setuid = true; + } + { + program = "start_kdeinit_wrapper"; + source = "${kde5.plasma-workspace}/lib/libexec/kf5/start_kdeinit_wrapper"; + owner = "root"; + setuid = true; + } + ]; environment.systemPackages = [ |