summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-02-01 00:10:47 +0100
committerGitHub <noreply@github.com>2021-02-01 00:10:47 +0100
commitebf0764ad73cc67b305bb4f01421f70f3e68f5fb (patch)
treeef12271f8fa04066d885108781e484e5e9e31bc2
parentac6ac61e3f4255ec7ebd9fad36f410dddb0fde7a (diff)
parent9270b9e626677a20bf8f9d314369e5dc06f2b913 (diff)
Merge pull request #111503 from minijackson/fix-carla-pyqt5-sip
-rw-r--r--pkgs/applications/audio/carla/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index a4b68707ee7c..40fb0cfda596 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)" ];
@@ -53,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" \