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 /pkgs/desktops/xfce/default.nix | |
| parent | d045d6250017af7e51bea494082cc564f063ef87 (diff) | |
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 'pkgs/desktops/xfce/default.nix')
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
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" |