diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-03-14 21:30:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-14 21:30:57 +0000 |
| commit | 77396a8c4762c37d563348ed74a2e1177e79e263 (patch) | |
| tree | a89a233e0141e68a5a8feb1ae06f369b64aa8aea /pkgs/applications/audio | |
| parent | 73d7dbf272b672c31509ad981bfe1435e7ab7739 (diff) | |
| parent | 368c8ae3980fffda8eda3d39e0c358f1b8acd031 (diff) | |
| download | nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.tar nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.tar.gz nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.tar.bz2 nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.tar.lz nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.tar.xz nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.tar.zst nixlib-77396a8c4762c37d563348ed74a2e1177e79e263.zip | |
Merge pull request #81098 from bignaux/cadence
cadence: fix dbus,libjack and missing dependancies
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cadence/default.nix | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 52f5a6540e8b..7aa2872224d7 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,15 +1,23 @@ { stdenv -, mkDerivation +, a2jmidid +, coreutils , lib +, libjack2 , fetchpatch , fetchzip +, jack_capture , pkgconfig +, pulseaudioFull , qtbase , makeWrapper -, python3Packages +, mkDerivation +, python3 }: +#ladish missing, claudia can't work. +#pulseaudio needs fixes (patchShebangs .pa ...) +#desktop needs icons and exec fixing. - mkDerivation rec { +mkDerivation rec { version = "0.9.1"; pname = "cadence"; @@ -26,12 +34,26 @@ }) ]; + postPatch = '' + 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[pulseaudioFull]}/pulseaudio" + substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ qtbase + jack_capture + pulseaudioFull + ((python3.withPackages (ps: with ps; [ + pyqt5 + dbus-python + ]))) ]; makeFlags = [ @@ -39,10 +61,6 @@ "SYSCONFDIR=${placeholder "out"}/etc" ]; - propagatedBuildInputs = with python3Packages; [ - pyqt5_with_qtwebkit - ]; - dontWrapQtApps = true; # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise. @@ -65,10 +83,11 @@ }; in lib.mapAttrsToList (script: source: '' rm -f ${script} - makeWrapper ${python3Packages.python.interpreter} ${script} \ - --set PYTHONPATH "$PYTHONPATH:${outRef}/share/cadence" \ - ''${qtWrapperArgs[@]} \ - --add-flags "-O ${source}" + makeQtWrapper ${source} ${script} \ + --prefix PATH : "${lib.makeBinPath [ + jack_capture # cadence-render + pulseaudioFull # cadence, cadence-session-start + ]}" '') scriptAndSource; meta = { |