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

renoise: add mpg123 to runtime deps #47435

Merged
merged 2 commits into from Nov 25, 2018
Merged

renoise: add mpg123 to runtime deps #47435

merged 2 commits into from Nov 25, 2018

Conversation

jpotier
Copy link
Contributor

@jpotier jpotier commented Sep 27, 2018

Motivation for this change

Renoise cannot read/use MP3 samples unless mpg123 is available to it.
It's an optional dependency and maybe there's a better way to provide this.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@jpotier
Copy link
Contributor Author

jpotier commented Sep 27, 2018

@the-kenny for review?

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
releasePath
else throw "Platform is not supported by Renoise";

buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 mpg123 ];
Copy link
Member

Choose a reason for hiding this comment

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

There is makeWrapper that can be used to put mpg123 into the PATH of renoise.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, true, I didn't think about it. I'll modify this PR

@jpotier
Copy link
Contributor Author

jpotier commented Oct 1, 2018

Sorry for the noise…

PR is now using wrapProgram

@c0bw3b c0bw3b merged commit 233a4ed into NixOS:master Nov 25, 2018
@@ -56,11 +58,12 @@ stdenv.mkDerivation rec {
ln -s $out/renoise $out/bin/renoise

patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
Copy link
Member

@Mic92 Mic92 Nov 26, 2018

Choose a reason for hiding this comment

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

I thought it uses the binary from mpg123. If it uses a library from that package, it is better to extend the patchelf command above:

patchelf \
   --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
   --set-rpath $out/lib:${mpg123}/lib \
   $out/renoise

Copy link
Contributor

Choose a reason for hiding this comment

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

True. I checked on their forum and it does need libmpg123.so only.
I tested locally and setting the RPATH to include ${mpg123}/lib does the trick
(app still shows File-IO: Enabling MP3 decoding support using system mpg123 library... in its startup logs)

I'll correct this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed in af31c4e

@jpotier jpotier deleted the sandbox/jpotier/renoise-add-mpg123 branch December 6, 2018 13:40
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

4 participants