From d432b75d0e96b5f9bf2fe97968910c060bb095bf Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 9 Jun 2015 22:46:14 +0200
Subject: Trivmix bump

---
 custom/trivmix-service.nix | 2 +-
 custom/trivmix.nix         | 6 +++---
 trivmix                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index b61ec977..99439042 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -37,7 +37,7 @@ in rec {
     requires = [ "jack.service" ];
     serviceConfig = {
       Type = "simple";
-      ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} --level /dev/shm/mix/${name}/level${if ! isNull group then " --dir /dev/shm/mix/${group}/level" else ""}'';
+      ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}'';
       User = "jack";
       Group = "audio";
     };
diff --git a/custom/trivmix.nix b/custom/trivmix.nix
index b0408f8c..f4ea72dd 100644
--- a/custom/trivmix.nix
+++ b/custom/trivmix.nix
@@ -7,11 +7,11 @@
 
 cabal.mkDerivation (self: {
   pname = "trivmix";
-  version = "2.0.0";
+  version = "2.1.0";
   src = fetchgit {
     url = git://git.yggdrasil.li/trivmix;
-    rev = "60cc6cf218d8f1a12360d0188450f83e04d92c1a";
-    sha256 = "327c886d0cd5adfe3fcb4a5f2fa00522de4a046aa72c447d3ae96288ce765ce9";
+    rev = "8bb5a7da733ee6da42b2b968a1c9fb70631e14a8";
+    sha256 = "28c406c1d3fa9e11cfe0cbc0eb9f0c487353f19b409e24cfdab604458f1662c2";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/trivmix b/trivmix
index fcbabab1..3a69e87a 160000
--- a/trivmix
+++ b/trivmix
@@ -1 +1 @@
-Subproject commit fcbabab1057b010cfd861d441931476ae6096e34
+Subproject commit 3a69e87a90d494aff3d187de2174cc1e92c331b0
-- 
cgit v1.2.3