public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cadence: fix pulseaudio bridge

Browse Source
This commit is contained in:
Bignaux Ronan 2020-02-26 17:54:08 +01:00
parent 7e63e254a1
commit 368c8ae398
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/cadence/default.nix
View File

@ -7,7 +7,7 @@
, fetchzip , fetchzip
, jack_capture , jack_capture
, pkgconfig , pkgconfig
, pulseaudio , pulseaudioFull
, qtbase , qtbase
, makeWrapper , makeWrapper
, mkDerivation , mkDerivation
@ -38,7 +38,7 @@ mkDerivation rec {
libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0); libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0);
substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso
substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \ 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 substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso
''; '';
@ -49,6 +49,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
qtbase qtbase
jack_capture jack_capture
pulseaudioFull
((python3.withPackages (ps: with ps; [ ((python3.withPackages (ps: with ps; [
pyqt5 pyqt5
dbus-python dbus-python
@ -83,7 +84,10 @@ mkDerivation rec {
in lib.mapAttrsToList (script: source: '' in lib.mapAttrsToList (script: source: ''
rm -f ${script} rm -f ${script}
makeQtWrapper ${source} ${script} \ makeQtWrapper ${source} ${script} \
--prefix PATH : "${lib.makeBinPath [jack_capture]}" --prefix PATH : "${lib.makeBinPath [
jack_capture # cadence-render
pulseaudioFull # cadence, cadence-session-start
]}"
'') scriptAndSource; '') scriptAndSource;
meta = { meta = {