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.

Sign up for GitHub

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

Jump to bottom

deadbeefPlugins.opus: init at 0.8 #35428

Merged
merged 1 commit into from Feb 24, 2018
Merged

deadbeefPlugins.opus: init at 0.8 #35428

merged 1 commit into from Feb 24, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Feb 23, 2018

Motivation for this change

Adds opus support to deadbeef.

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.

Mic92
Mic92 reviewed Feb 23, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
opus = callPackage ../applications/audio/deadbeef/plugins/opus.nix { };
};

deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # renamed on 2018-02-23
Copy link
Member

Choose a reason for hiding this comment

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

Maybe pkgs/top-level/aliases.nix instead? Or do we want this permanent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cool, this will be useful for #32804

@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

@GrahamcOfBorg build deadbeefPlugins.opus

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘deadbeef-opus-plugin-0.8’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/applications/audio/deadbeef/plugins/opus.nix:25 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

mkdir -p /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8/lib/deadbeef
cp opus.so /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8/lib/deadbeef
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8
shrinking /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8/lib/deadbeef/opus.so
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8/lib 
patching script interpreter paths in /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8
checking for references to /tmp/nix-build-deadbeef-opus-plugin-0.8.drv-0 in /nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8...
/nix/store/cspqkbawnfdp2h99bknj2v8vjx7pcnf1-deadbeef-opus-plugin-0.8

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

adplug/fmopl.c:599:2: note: within this loop
  for (i = 60;i < 76;i++)
  ^~~
make[2]: Leaving directory '/build/deadbeef-0.7.2/plugins/adplug'
make[1]: *** [Makefile:769: all-recursive] Error 1
make[1]: Leaving directory '/build/deadbeef-0.7.2'
make: *** [Makefile:527: all] Error 2
builder for '/nix/store/j98h0ny3yfr908ddzx3ppw1wr4qg32jn-deadbeef-0.7.2.drv' failed with exit code 2
cannot build derivation '/nix/store/wf0gdza28ip1r39n8g8ww619xabdsihh-deadbeef-opus-plugin-0.8.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/wf0gdza28ip1r39n8g8ww619xabdsihh-deadbeef-opus-plugin-0.8.drv' failed

@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

Interesting to see those compiler error messages only on aarch64.

jtojnar
jtojnar commented Feb 24, 2018
View reviewed changes
pkgs/top-level/aliases.nix Outdated
@@ -49,6 +49,7 @@ mapAliases (rec {
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
cv = progress; # added 2015-09-06
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added on 2018-02-23
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, preposition.

@jtojnar jtojnar merged commit 2cb88c5 into NixOS:master Feb 24, 2018
@jtojnar jtojnar deleted the deadbeef-opus branch February 24, 2018 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jtojnar @Mic92 @GrahamcOfBorg