tetraproc: add missing Xorg libs & ensure Jack is in PATH

1 files changed, 15 insertions, 2 deletions

diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index b1356d3c547..309a400c555 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, fftwFloat, freetype, jack2, libclthreads, libclxclient, libsndfile, x11 }:
+{ stdenv, fetchurl, makeWrapper
+, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient
+, libsndfile, libxcb, xlibs
+}:
 
 stdenv.mkDerivation rec {
   name = "tetraproc-${version}";
@@ -9,7 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
   };
 
-  buildInputs = [ jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [
+    expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
+    libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender
+  ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -20,6 +28,11 @@ stdenv.mkDerivation rec {
     cd ./source/
   '';
 
+  postInstall = ''
+    # Make sure Jack is avalable in $PATH for tetraproc
+    wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin"
+  '';
+
   meta = with stdenv.lib; {
     description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording";
     homepage = http://kokkinizita.linuxaudio.org/linuxaudio/;