colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

sonic-pi: add pipewire.jack
This commit is contained in:
Aleksana 2024-04-27 15:26:32 +08:00 committed by GitHub
parent 010997eec1 30332b97c3
commit 7defa1605e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/audio/sonic-pi/default.nix
View File

@ -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

5
pkgs/top-level/all-packages.nix
View File

@ -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;