Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

supercollider: added alsaLib as dependency, req. for MIDI on Linux #33262

Closed
wants to merge 2 commits into from

Conversation

f--t
Copy link
Contributor

@f--t f--t commented Jan 1, 2018

Motivation for this change

Currently MIDIClient.init command in SC fails mysteriously on Linux. SC requires alsa at compile time to enable MIDI. This commit fixes that issue.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -1,6 +1,8 @@
{ stdenv, fetchurl, cmake, pkgconfig
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebkit, readline
, withAlsa ? !stdenv.isDarwin, alsaLib # ALSA is required for MIDI to work in SC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need for withAlsa: enable it for Linux unconditionally.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put in ALSA to be optional since it's indicated as optional in supercollider readme.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevertheless, there is no use in making it optional in Nixpkgs.

@@ -1,6 +1,8 @@
{ stdenv, fetchurl, cmake, pkgconfig
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebkit, readline
, withAlsa ? !stdenv.isDarwin, alsaLib # ALSA is required for MIDI to work in SC
, withAvahi ? false, avahi # Avahai is optional dependency
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qtbase already depends on avahi, no need to make it optional here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the cmake build system doesn't find avahi unless specifically added to dependencies

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please add it as a dependency, but remove withAvahi option.

@@ -24,10 +26,12 @@ stdenv.mkDerivation rec {
-DSC_EL=${if useSCEL then "ON" else "OFF"}
'';

nativeBuildInputs = [ cmake pkgconfig qttools ];
nativeBuildInputs = [cmake pkgconfig qttools ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Restore space after [.

incorporated the reviewer's comments
@f--t
Copy link
Contributor Author

f--t commented Jan 18, 2018

@orivej requested changes have been applied, please let me know if further changes are need.

Copy link
Contributor Author

@f--t f--t left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes has been submitted, please let me know if further action is required.

@f--t f--t closed this Mar 30, 2018
@f--t f--t deleted the fix/supercollider branch October 20, 2019 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants