diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2020-02-26 17:54:08 +0100 |
|---|---|---|
| committer | Bignaux Ronan <ronan@aimao.org> | 2020-02-26 17:54:08 +0100 |
| commit | 368c8ae3980fffda8eda3d39e0c358f1b8acd031 (patch) | |
| tree | e589210e63172d18c44513ab7b38879f384378b3 /pkgs/applications/audio | |
| parent | 7e63e254a1557075b3deaecfb38c9c778718204b (diff) | |
| download | nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.tar nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.tar.gz nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.tar.bz2 nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.tar.lz nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.tar.xz nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.tar.zst nixlib-368c8ae3980fffda8eda3d39e0c358f1b8acd031.zip | |
cadence: fix pulseaudio bridge
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cadence/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 3cde3d9009ce..7aa2872224d7 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -7,7 +7,7 @@ , fetchzip , jack_capture , pkgconfig -, pulseaudio +, pulseaudioFull , qtbase , makeWrapper , mkDerivation @@ -38,7 +38,7 @@ mkDerivation rec { libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0); substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \ - "${lib.makeBinPath[pulseaudio]}/pulseaudio" + "${lib.makeBinPath[pulseaudioFull]}/pulseaudio" substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso ''; @@ -49,6 +49,7 @@ mkDerivation rec { buildInputs = [ qtbase jack_capture + pulseaudioFull ((python3.withPackages (ps: with ps; [ pyqt5 dbus-python @@ -83,7 +84,10 @@ mkDerivation rec { in lib.mapAttrsToList (script: source: '' rm -f ${script} makeQtWrapper ${source} ${script} \ - --prefix PATH : "${lib.makeBinPath [jack_capture]}" + --prefix PATH : "${lib.makeBinPath [ + jack_capture # cadence-render + pulseaudioFull # cadence, cadence-session-start + ]}" '') scriptAndSource; meta = { |