Merge pull request #111503 from minijackson/fix-carla-pyqt5-sip

This commit is contained in:
Sandro
2021-02-01 00:10:47 +01:00
committed by GitHub
+4 -2
View File
@@ -34,11 +34,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile
] ++ pythonPath ] ++ optional withQt qtbase
++ optional withQt qtbase
++ optional withGtk2 gtk2 ++ optional withGtk2 gtk2
++ optional withGtk3 gtk3; ++ optional withGtk3 gtk3;
propagatedBuildInputs = pythonPath;
enableParallelBuilding = true; enableParallelBuilding = true;
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
@@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
patchPythonScript "$f" patchPythonScript "$f"
done done
patchPythonScript "$out/share/carla/carla_settings.py" patchPythonScript "$out/share/carla/carla_settings.py"
patchPythonScript "$out/share/carla/carla_database.py"
for program in $out/bin/*; do for program in $out/bin/*; do
wrapQtApp "$program" \ wrapQtApp "$program" \