diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:55:57 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:56:39 -0500 |
| commit | 4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed (patch) | |
| tree | 5e3bc7683f60afdc70bc0e201d05aca858b1896f /nixos/modules/config/pulseaudio.nix | |
| parent | b3ab4d1f8e6fc6897fe561039b14d360fe8164f8 (diff) | |
| download | nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.gz nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.bz2 nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.lz nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.xz nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.tar.zst nixpkgs-4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed.zip | |
treewide: remove pkgs_i686
This was getting evaluated eagerly causing assertion failures in aarch64 systems. We can replace usages of pkgs_i686 with pkgs.pkgsi686Linux.
Diffstat (limited to 'nixos/modules/config/pulseaudio.nix')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index d4aa5950629..67f7105fe2f 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with pkgs; with lib; @@ -19,7 +19,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null); myConfigFile = @@ -63,7 +63,7 @@ let pcm_type.pulse { libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"} } pcm.!default { type pulse @@ -72,7 +72,7 @@ let ctl_type.pulse { libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} } ctl.!default { type pulse |