carla: properly wrap plugin programs. fixes #67923

This commit is contained in:
Minijackson 2019-09-14 16:14:02 +02:00
parent 5616f9937a
commit 8f32a16152
No known key found for this signature in database
GPG Key ID: FEA888C9F5D64F62

View File

@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
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"
@ -58,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; {