Unverified Commit 7defa160 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #286600 from m-bdf/sonic-pi-add-pipewire-jack 

sonic-pi: add pipewire.jack
parents 010997ee 30332b97

pkgs/applications/audio/sonic-pi/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
, aubio

, jack2

, jack-example-tools

, pipewire

, supercollider-with-sc3-plugins

, parallel
@@ -188,14 +189,14 @@ stdenv.mkDerivation rec { 
  preFixup = ''

    # Wrap Qt GUI (distributed binary)

    wrapQtApp $out/bin/sonic-pi \

      --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]}

      --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools pipewire.jack ]}



    # If ImGui was built

    if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then

      # Wrap ImGui into bin

      makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \

        --inherit-argv0 \

        --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]}

        --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools pipewire.jack ]}

    fi



    # Remove runtime Erlang references

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -34544,10 +34544,7 @@ with pkgs; 














  wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { };



























  sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi {













    elixir = elixir_1_14;













    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });













  };













  sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };





























  stag = callPackage ../applications/misc/stag {















    curses = ncurses;