diff options
| author | Daniel Schaefer <git@danielschaefer.me> | 2020-02-28 22:14:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 22:14:48 +0100 |
| commit | 4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e (patch) | |
| tree | b07bbe9526bd4b5c40bd97b6da5921330ffc577e | |
| parent | 2bbdd94868b41e0a4d64b3902301bb411e42ecb8 (diff) | |
| parent | 8f32a1615262555e14257e4f9919848dec1540b8 (diff) | |
| download | nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.tar nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.tar.gz nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.tar.bz2 nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.tar.lz nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.tar.xz nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.tar.zst nixlib-4dfb636e25f77ae8b5a16acfd1c87f0b72d1f27e.zip | |
Merge pull request #68795 from minijackson/carla-fix-67923
Carla: properly wrap plugin programs
| -rw-r--r-- | pkgs/applications/audio/carla/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 98a4ddd29d6e..6641e99e4917 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -39,12 +39,15 @@ stdenv.mkDerivation rec { ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; + enableParallelBuilding = true; + installFlags = [ "PREFIX=$(out)" ]; dontWrapQtApps = true; postFixup = '' # Also sets program_PYTHONPATH and program_PATH variables 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 patchPythonScript "$f" @@ -56,6 +59,12 @@ stdenv.mkDerivation rec { --prefix PATH : "$program_PATH:${which}/bin" \ --set PYTHONNOUSERSITE true 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; { |