cadence: fix dbus,libjack and missing dependancies

This commit is contained in:
Bignaux Ronan 2020-02-26 08:05:56 +01:00
parent 563b480b6f
commit 7e63e254a1
2 changed files with 27 additions and 12 deletions

View File

@ -1,15 +1,23 @@
{ stdenv { stdenv
, mkDerivation , a2jmidid
, coreutils
, lib , lib
, libjack2
, fetchpatch , fetchpatch
, fetchzip , fetchzip
, jack_capture
, pkgconfig , pkgconfig
, pulseaudio
, qtbase , qtbase
, makeWrapper , 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"; version = "0.9.1";
pname = "cadence"; pname = "cadence";
@ -26,12 +34,25 @@
}) })
]; ];
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[pulseaudio]}/pulseaudio"
substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso
'';
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
]; ];
buildInputs = [ buildInputs = [
qtbase qtbase
jack_capture
((python3.withPackages (ps: with ps; [
pyqt5
dbus-python
])))
]; ];
makeFlags = [ makeFlags = [
@ -39,10 +60,6 @@
"SYSCONFDIR=${placeholder "out"}/etc" "SYSCONFDIR=${placeholder "out"}/etc"
]; ];
propagatedBuildInputs = with python3Packages; [
pyqt5_with_qtwebkit
];
dontWrapQtApps = true; dontWrapQtApps = true;
# Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise. # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise.
@ -65,10 +82,8 @@
}; };
in lib.mapAttrsToList (script: source: '' in lib.mapAttrsToList (script: source: ''
rm -f ${script} rm -f ${script}
makeWrapper ${python3Packages.python.interpreter} ${script} \ makeQtWrapper ${source} ${script} \
--set PYTHONPATH "$PYTHONPATH:${outRef}/share/cadence" \ --prefix PATH : "${lib.makeBinPath [jack_capture]}"
''${qtWrapperArgs[@]} \
--add-flags "-O ${source}"
'') scriptAndSource; '') scriptAndSource;
meta = { meta = {

View File

@ -18286,7 +18286,7 @@ in
azpainter = callPackage ../applications/graphics/azpainter { }; azpainter = callPackage ../applications/graphics/azpainter { };
cadence = libsForQt5.callPackage ../applications/audio/cadence { }; cadence = qt5.callPackage ../applications/audio/cadence { };
milkytracker = callPackage ../applications/audio/milkytracker { }; milkytracker = callPackage ../applications/audio/milkytracker { };