diff options
| author | Wei Tang <accounts@that.world> | 2017-12-20 03:28:12 +0800 |
|---|---|---|
| committer | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-19 22:28:12 +0300 |
| commit | 62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed (patch) | |
| tree | 141c13c41d955253399a890806ef8c13c6b20c0d /nixos/modules/services/x11 | |
| parent | d045d6250017af7e51bea494082cc564f063ef87 (diff) | |
| download | nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.tar nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.tar.gz nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.tar.bz2 nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.tar.lz nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.tar.xz nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.tar.zst nixlib-62a974bbbf4da9d9d6dd1838b80a2be78c45d5ed.zip | |
xfce: delay package selection for pulseaudio volume to nixos modules (#23382)
Now there are separate `xfce4.xfce4mixer_pulse` and `xfce4.xfcevolumed_pulse` attributes for PulseAudio versions of these packages, instead of relying on Nixpkgs option. Mind that xfce4-volumed and xfce4-volumed-pulse are actually two separate programs without much overlap.
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 8c108bfddc63..8c8f9a825ea2 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -5,6 +5,7 @@ with lib; let xcfg = config.services.xserver; + pcfg = config.hardware.pulseaudio; cfg = xcfg.desktopManager.xfce; in @@ -96,8 +97,8 @@ in pkgs.xfce.xfce4icontheme pkgs.xfce.xfce4session pkgs.xfce.xfce4settings - pkgs.xfce.xfce4mixer - pkgs.xfce.xfce4volumed + (if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer) + (if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else pkgs.xfce.xfce4volumed) pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfconf # This supplies some "abstract" icons such as |