Merge pull request #68795 from minijackson/carla-fix-67923

Carla: properly wrap plugin programs
This commit is contained in:
Daniel Schaefer 2020-02-28 22:14:48 +01:00 committed by GitHub
commit 4dfb636e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions

View File

@ -39,12 +39,15 @@ stdenv.mkDerivation rec {
++ optional withGtk2 gtk2 ++ optional withGtk2 gtk2
++ optional withGtk3 gtk3; ++ optional withGtk3 gtk3;
enableParallelBuilding = true;
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
dontWrapQtApps = true; dontWrapQtApps = true;
postFixup = '' postFixup = ''
# Also sets program_PYTHONPATH and program_PATH variables # Also sets program_PYTHONPATH and program_PATH variables
wrapPythonPrograms wrapPythonPrograms
wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath"
find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
patchPythonScript "$f" patchPythonScript "$f"
@ -56,6 +59,12 @@ stdenv.mkDerivation rec {
--prefix PATH : "$program_PATH:${which}/bin" \ --prefix PATH : "$program_PATH:${which}/bin" \
--set PYTHONNOUSERSITE true --set PYTHONNOUSERSITE true
done done
find "$out/share/carla/resources" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
wrapQtApp "$f" \
--prefix PATH : "$program_PATH:${which}/bin" \
--set PYTHONNOUSERSITE true
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {