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/services/audio/jack.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/services/audio/jack.nix')
-rw-r--r-- | nixos/modules/services/audio/jack.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index f341b432f75..d0a95b87ee1 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -8,7 +8,7 @@ let pcmPlugin = cfg.jackd.enable && cfg.alsa.enable; loopback = cfg.jackd.enable && cfg.loopback.enable; - enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsaLib != null; + enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; @@ -129,9 +129,9 @@ in { (mkIf pcmPlugin { sound.extraConfig = '' pcm_type.jack { - libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; + libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; ${lib.optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;"} } pcm.!default { @func getenv @@ -234,7 +234,7 @@ in { environment = { systemPackages = [ cfg.jackd.package ]; - etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsaPlugins}/etc/alsa/conf.d/50-jack.conf"; + etc."alsa/conf.d/50-jack.conf".source = "${pkgs.alsa-plugins}/etc/alsa/conf.d/50-jack.conf"; variables.JACK_PROMISCUOUS_SERVER = "jackaudio"; }; |