From 59fd2f5e7851123864a1f675c81d20fd74285357 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 31 Jan 2021 23:17:13 +0100 Subject: [PATCH 1/2] carla: fixed crash on launch "No module named 'PyQt5.sip'" --- pkgs/applications/audio/carla/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index a4b68707ee7c..500bbc81d38f 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -34,11 +34,12 @@ stdenv.mkDerivation rec { buildInputs = [ file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile - ] ++ pythonPath - ++ optional withQt qtbase + ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; + propagatedBuildInputs = pythonPath; + enableParallelBuilding = true; installFlags = [ "PREFIX=$(out)" ]; From 9270b9e626677a20bf8f9d314369e5dc06f2b913 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 31 Jan 2021 23:39:36 +0100 Subject: [PATCH 2/2] carla: fix carla-database not properly python-wrapped --- pkgs/applications/audio/carla/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 500bbc81d38f..40fb0cfda596 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { patchPythonScript "$f" done patchPythonScript "$out/share/carla/carla_settings.py" + patchPythonScript "$out/share/carla/carla_database.py" for program in $out/bin/*; do wrapQtApp "$program" \