diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-06-10 09:27:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-06-10 09:46:55 +0200 |
| commit | 2ee781417e9da2b553db0ab777aa89cd81fab54e (patch) | |
| tree | 65ac966996a7647dabb658dd5f2250efa5f8add5 /nixos/modules/config/pulseaudio.nix | |
| parent | 5f16549ccfcc896af2c7041e474c8fb55b1218bf (diff) | |
| download | nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.tar nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.tar.gz nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.tar.bz2 nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.tar.lz nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.tar.xz nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.tar.zst nixpkgs-2ee781417e9da2b553db0ab777aa89cd81fab54e.zip | |
nixos/*: replace alsa* aliases
The attributes got renamed in PR #126440 and in some places this caused evaluation errors, e.g. the tarball job was saying (locally) > attribute 'alsaUtils' missing, at /build/source/nixos/modules/services/audio/alsa.nix:6:4 and I suspect that trunk-combined jobset's failure to evaluate was also caused.
Diffstat (limited to 'nixos/modules/config/pulseaudio.nix')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 0266bbfb121..3f7ae109e8c 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -17,9 +17,9 @@ let binary = "${getBin overriddenPackage}/bin/pulseaudio"; binaryNoDaemon = "${binary} --daemonize=no"; - # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps + # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = @@ -62,18 +62,18 @@ let # plugin. alsaConf = writeText "asound.conf" ('' pcm_type.pulse { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} } pcm.!default { type pulse hint.description "Default Audio Device (via PulseAudio)" } ctl_type.pulse { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} } ctl.!default { type pulse |