Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2bbdd94868b4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4dfb636e25f7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 14, 2019

  1. carla: enable parallel building

    @minijackson
    minijackson committed Sep 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    minijackson Rémi NICOLE
    GPG key ID: FEA888C9F5D64F62
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5616f99 View commit details

  2. carla: properly wrap plugin programs. fixes #67923

    @minijackson
    minijackson committed Sep 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    minijackson Rémi NICOLE
    GPG key ID: FEA888C9F5D64F62
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8f32a16 View commit details

Commits on Feb 28, 2020

  1. Merge pull request #68795 from minijackson/carla-fix-67923 

    Carla: properly wrap plugin programs
    @JohnAZoidberg
    JohnAZoidberg authored Feb 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4dfb636 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/applications/audio/carla/default.nix
9 changes: 9 additions & 0 deletions pkgs/applications/audio/carla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {