about summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-03-25 22:53:12 +0000
committerOrivej Desh <orivej@gmx.fr>2020-03-25 23:01:42 +0000
commitc2f5006735f63faf49034b7e32675c7bdc15652b (patch)
treefde636be80a4114cacb3f409cf70ee598cc1d71b /pkgs/tools/misc
parent87f75f8e35749394af36e0cb86b323c32262c947 (diff)
downloadnixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.tar
nixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.tar.gz
nixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.tar.bz2
nixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.tar.lz
nixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.tar.xz
nixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.tar.zst
nixlib-c2f5006735f63faf49034b7e32675c7bdc15652b.zip
timidity: fix playing over JACK with -iA -Oj
Based on https://bugs.archlinux.org/task/40906#comment124519
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/timidity/default.nix2
-rw-r--r--pkgs/tools/misc/timidity/timidity-iA-Oj.patch14
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index c307c96199f2..88c3c7cb4252 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn";
   };
 
+  patches = [ ./timidity-iA-Oj.patch ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ alsaLib libjack2 ncurses ];
 
diff --git a/pkgs/tools/misc/timidity/timidity-iA-Oj.patch b/pkgs/tools/misc/timidity/timidity-iA-Oj.patch
new file mode 100644
index 000000000000..9bb964134283
--- /dev/null
+++ b/pkgs/tools/misc/timidity/timidity-iA-Oj.patch
@@ -0,0 +1,14 @@
+Without this timidity -iA -Oj prints "Couldn't start JACK device (`j')"
+and does not play MIDI.
+
+--- a/timidity/jack_a.c
++++ b/timidity/jack_a.c
+@@ -513,6 +513,8 @@ static int actl_jack(int request, void *arg)
+ 		ringbuf_clear(&ctx->rbuf);
+ 		return 0;
+ 
++	case PM_REQ_PLAY_START:
++		return 0;
+ 	}
+ 	return -1;
+ }