JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfce: delay package selection for pulseaudio volume to nixos modules (#23382)

Browse Source 
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.
This commit is contained in:
Wei Tang 2017-12-20 03:28:12 +08:00 committed by Yegor Timoshenko
parent d045d62500
commit 62a974bbbf
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -5,6 +5,7 @@ with lib;
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
pcfg = config.hardware.pulseaudio;
cfg = xcfg.desktopManager.xfce; cfg = xcfg.desktopManager.xfce;
in in
@ -96,8 +97,8 @@ in
pkgs.xfce.xfce4icontheme pkgs.xfce.xfce4icontheme
pkgs.xfce.xfce4session pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings pkgs.xfce.xfce4settings
pkgs.xfce.xfce4mixer (if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer)
pkgs.xfce.xfce4volumed (if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else pkgs.xfce.xfce4volumed)
pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfce4-screenshooter
pkgs.xfce.xfconf pkgs.xfce.xfconf
# This supplies some "abstract" icons such as # This supplies some "abstract" icons such as

11
pkgs/desktops/xfce/default.nix
View File

@ -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 { }; parole = callPackage ./applications/parole.nix { };
ristretto = callPackage ./applications/ristretto.nix { }; ristretto = callPackage ./applications/ristretto.nix { };
terminal = xfce4terminal; # it has changed its name terminal = xfce4terminal; # it has changed its name
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
pulseaudioSupport = config.pulseaudio or false; xfce4mixer_pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
};
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { };
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
xfce4volumed = let xfce4volumed = callPackage ./applications/xfce4-volumed.nix { };
gst = callPackage ./applications/xfce4-volumed.nix { }; xfce4volumed_pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
in if config.pulseaudio or false then pulse else gst;
#### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"