diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-09 16:42:35 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-09 16:42:35 +0100 |
commit | d88973bfbfc285fe2291ed606a271db26e0b51e8 (patch) | |
tree | 4246e51597cff73032f876d1205cd02ef9b7cdcc | |
parent | a75cb731911c5b7fcd194d78010847f14f0f69fe (diff) | |
download | nixos-d88973bfbfc285fe2291ed606a271db26e0b51e8.tar nixos-d88973bfbfc285fe2291ed606a271db26e0b51e8.tar.gz nixos-d88973bfbfc285fe2291ed606a271db26e0b51e8.tar.bz2 nixos-d88973bfbfc285fe2291ed606a271db26e0b51e8.tar.xz nixos-d88973bfbfc285fe2291ed606a271db26e0b51e8.zip |
Fix trivmix-service
-rw-r--r-- | bragi.nix | 2 | ||||
-rw-r--r-- | custom/trivmix-service.nix | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,7 +1,7 @@ | |||
1 | { config, pkgs, ... }: | 1 | { config, pkgs, ... }: |
2 | 2 | ||
3 | let | 3 | let |
4 | trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out; | 4 | trivmixService = pkgs.callPackage ./custom/trivmix-service.nix; |
5 | thermoprint-servant = (pkgs.callPackage ./custom/thermoprint {}).thermoprint-servant; | 5 | thermoprint-servant = (pkgs.callPackage ./custom/thermoprint {}).thermoprint-servant; |
6 | inherit (pkgs) lib; | 6 | inherit (pkgs) lib; |
7 | in rec { | 7 | in rec { |
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix index 7243f5e1..04f1634b 100644 --- a/custom/trivmix-service.nix +++ b/custom/trivmix-service.nix | |||
@@ -17,6 +17,8 @@ let | |||
17 | connectScript = writeScript "connect" '' | 17 | connectScript = writeScript "connect" '' |
18 | #!${stdenv.shell} | 18 | #!${stdenv.shell} |
19 | 19 | ||
20 | PATH=${jack2Full}/bin:$PATH | ||
21 | |||
20 | ${optionalString (! isNull connectIn) "jack_connect ${connectIn} $1"} | 22 | ${optionalString (! isNull connectIn) "jack_connect ${connectIn} $1"} |
21 | ${optionalString (! isNull connectOut) "jack_connect $2 ${connectOut}"} | 23 | ${optionalString (! isNull connectOut) "jack_connect $2 ${connectOut}"} |
22 | ''; | 24 | ''; |