diff options
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/xfce/default.nix | 11 |
2 files changed, 7 insertions, 9 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 diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 6fa9c991dbd9..b18f3466770a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -58,17 +58,14 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od parole = callPackage ./applications/parole.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { - pulseaudioSupport = config.pulseaudio or false; - }; + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + xfce4mixer_pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; }; xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; - xfce4volumed = let - gst = callPackage ./applications/xfce4-volumed.nix { }; - pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; - in if config.pulseaudio or false then pulse else gst; + xfce4volumed = callPackage ./applications/xfce4-volumed.nix { }; + xfce4volumed_pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" |