From c16c1e973412260d0a849d227bc6e79ed69984fd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 8 Mar 2017 19:06:23 +0100
Subject: Bump trivmix

---
 custom/trivmix             | 2 +-
 custom/trivmix-service.nix | 3 ++-
 custom/trivmix.nix         | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 120000 custom/trivmix.nix

(limited to 'custom')

diff --git a/custom/trivmix b/custom/trivmix
index c22d1fba..6454da50 160000
--- a/custom/trivmix
+++ b/custom/trivmix
@@ -1 +1 @@
-Subproject commit c22d1fbab9ffd09d461b82b096d9cac0edea7775
+Subproject commit 6454da50559e0eee810f81d33365a621857d8068
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 @@
 , connectOut ? null
 , connectIn ? null
 , group ? null
+, initial ? null
 , trivmix
 , stdenv
 , makeWrapper
@@ -39,7 +40,7 @@ in rec {
     before = [ "mpd.service" ];
     serviceConfig = {
       Type = "simple";
-      ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}'';
+      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 ""}'';
       User = "jack";
       Group = "audio";
       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 @@
-trivmix/package.nix
\ No newline at end of file
-- 
cgit v1.2.3