diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-08 19:06:23 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-08 19:06:23 +0100 |
| commit | c16c1e973412260d0a849d227bc6e79ed69984fd (patch) | |
| tree | aedd0c01547f59156ec238be575abc83849e15c5 /custom | |
| parent | 8a865390e31f4b6ded8cdbb711a50924c72da00c (diff) | |
| download | nixos-c16c1e973412260d0a849d227bc6e79ed69984fd.tar nixos-c16c1e973412260d0a849d227bc6e79ed69984fd.tar.gz nixos-c16c1e973412260d0a849d227bc6e79ed69984fd.tar.bz2 nixos-c16c1e973412260d0a849d227bc6e79ed69984fd.tar.xz nixos-c16c1e973412260d0a849d227bc6e79ed69984fd.zip | |
Bump trivmix
Diffstat (limited to 'custom')
| m--------- | custom/trivmix | 0 | ||||
| -rw-r--r-- | custom/trivmix-service.nix | 3 | ||||
| l--------- | custom/trivmix.nix | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/custom/trivmix b/custom/trivmix | |||
| Subproject c22d1fbab9ffd09d461b82b096d9cac0edea777 | Subproject 6454da50559e0eee810f81d33365a621857d806 | ||
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix index 3c3cded7..09a6dd3b 100644 --- a/custom/trivmix-service.nix +++ b/custom/trivmix-service.nix | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | , connectOut ? null | 3 | , connectOut ? null |
| 4 | , connectIn ? null | 4 | , connectIn ? null |
| 5 | , group ? null | 5 | , group ? null |
| 6 | , initial ? null | ||
| 6 | , trivmix | 7 | , trivmix |
| 7 | , stdenv | 8 | , stdenv |
| 8 | , makeWrapper | 9 | , makeWrapper |
| @@ -39,7 +40,7 @@ in rec { | |||
| 39 | before = [ "mpd.service" ]; | 40 | before = [ "mpd.service" ]; |
| 40 | serviceConfig = { | 41 | serviceConfig = { |
| 41 | Type = "simple"; | 42 | Type = "simple"; |
| 42 | ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}''; | 43 | ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun}${optionalString (initial != null) " --level ${initial}"} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}''; |
| 43 | User = "jack"; | 44 | User = "jack"; |
| 44 | Group = "audio"; | 45 | Group = "audio"; |
| 45 | Nice = "-10"; | 46 | Nice = "-10"; |
diff --git a/custom/trivmix.nix b/custom/trivmix.nix deleted file mode 120000 index c2f64840..00000000 --- a/custom/trivmix.nix +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | trivmix/package.nix \ No newline at end of file | ||