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

nixos/services.jack: remove with lib;

Browse Source
This commit is contained in:
Felix Buehler 2024-08-30 00:46:35 +02:00
parent e8fa5a92e9
commit 291d92e529
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
nixos/modules/services/audio/jack.nix
View File

@ -1,7 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
let let
cfg = config.services.jack; cfg = config.services.jack;
@ -10,29 +7,29 @@ let
enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null; enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.alsa-lib != null;
umaskNeeded = versionOlder cfg.jackd.package.version "1.9.12"; umaskNeeded = lib.versionOlder cfg.jackd.package.version "1.9.12";
bridgeNeeded = versionAtLeast cfg.jackd.package.version "1.9.12"; bridgeNeeded = lib.versionAtLeast cfg.jackd.package.version "1.9.12";
in { in {
options = { options = {
services.jack = { services.jack = {
jackd = { jackd = {
enable = mkEnableOption '' enable = lib.mkEnableOption ''
JACK Audio Connection Kit. You need to add yourself to the "jackaudio" group JACK Audio Connection Kit. You need to add yourself to the "jackaudio" group
''; '';
package = mkPackageOption pkgs "jack2" { package = lib.mkPackageOption pkgs "jack2" {
example = "jack1"; example = "jack1";
} // { } // {
# until jack1 promiscuous mode is fixed # until jack1 promiscuous mode is fixed
internal = true; internal = true;
}; };
extraOptions = mkOption { extraOptions = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
default = [ default = [
"-dalsa" "-dalsa"
]; ];
example = literalExpression '' example = lib.literalExpression ''
[ "-dalsa" "--device" "hw:1" ]; [ "-dalsa" "--device" "hw:1" ];
''; '';
description = '' description = ''
@ -40,8 +37,8 @@ in {
''; '';
}; };
session = mkOption { session = lib.mkOption {
type = types.lines; type = lib.types.lines;
description = '' description = ''
Commands to run after JACK is started. Commands to run after JACK is started.
''; '';
@ -50,16 +47,16 @@ in {
}; };
alsa = { alsa = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Route audio to/from generic ALSA-using applications using ALSA JACK PCM plugin. Route audio to/from generic ALSA-using applications using ALSA JACK PCM plugin.
''; '';
}; };
support32Bit = mkOption { support32Bit = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Whether to support sound for 32-bit ALSA applications on 64-bit system. Whether to support sound for 32-bit ALSA applications on 64-bit system.
@ -68,8 +65,8 @@ in {
}; };
loopback = { loopback = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Create ALSA loopback device, instead of using PCM plugin. Has broader Create ALSA loopback device, instead of using PCM plugin. Has broader
@ -78,23 +75,23 @@ in {
''; '';
}; };
index = mkOption { index = lib.mkOption {
type = types.int; type = lib.types.int;
default = 10; default = 10;
description = '' description = ''
Index of an ALSA loopback device. Index of an ALSA loopback device.
''; '';
}; };
config = mkOption { config = lib.mkOption {
type = types.lines; type = lib.types.lines;
description = '' description = ''
ALSA config for loopback device. ALSA config for loopback device.
''; '';
}; };
dmixConfig = mkOption { dmixConfig = lib.mkOption {
type = types.lines; type = lib.types.lines;
default = ""; default = "";
example = '' example = ''
period_size 2048 period_size 2048
@ -107,8 +104,8 @@ in {
''; '';
}; };
session = mkOption { session = lib.mkOption {
type = types.lines; type = lib.types.lines;
description = '' description = ''
Additional commands to run to setup loopback device. Additional commands to run to setup loopback device.
''; '';
@ -119,9 +116,9 @@ in {
}; };
config = mkMerge [ config = lib.mkMerge [
(mkIf pcmPlugin { (lib.mkIf pcmPlugin {
environment.etc."alsa/conf.d/98-jack.conf".text = '' environment.etc."alsa/conf.d/98-jack.conf".text = ''
pcm_type.jack { pcm_type.jack {
libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ; libs.native = ${pkgs.alsa-plugins}/lib/alsa-lib/libasound_module_pcm_jack.so ;
@ -136,13 +133,13 @@ in {
''; '';
}) })
(mkIf loopback { (lib.mkIf loopback {
boot.kernelModules = [ "snd-aloop" ]; boot.kernelModules = [ "snd-aloop" ];
boot.kernelParams = [ "snd-aloop.index=${toString cfg.loopback.index}" ]; boot.kernelParams = [ "snd-aloop.index=${toString cfg.loopback.index}" ];
environment.etc."alsa/conf.d/99-jack-loopback.conf".text = cfg.loopback.config; environment.etc."alsa/conf.d/99-jack-loopback.conf".text = cfg.loopback.config;
}) })
(mkIf cfg.jackd.enable { (lib.mkIf cfg.jackd.enable {
services.jack.jackd.session = '' services.jack.jackd.session = ''
${lib.optionalString bridgeNeeded "${pkgs.a2jmidid}/bin/a2jmidid -e &"} ${lib.optionalString bridgeNeeded "${pkgs.a2jmidid}/bin/a2jmidid -e &"}
''; '';
@ -247,7 +244,7 @@ in {
ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}"; ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}";
LimitRTPRIO = 99; LimitRTPRIO = 99;
LimitMEMLOCK = "infinity"; LimitMEMLOCK = "infinity";
} // optionalAttrs umaskNeeded { } // lib.optionalAttrs umaskNeeded {
UMask = "007"; UMask = "007";
}; };
path = [ cfg.jackd.package ]; path = [ cfg.jackd.package ];