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

mpv: Fix mpv 0.29.0 on macOS and disable OpenAL #44368

Merged
merged 1 commit into from
Aug 3, 2018
Merged

mpv: Fix mpv 0.29.0 on macOS and disable OpenAL #44368

merged 1 commit into from
Aug 3, 2018
+12 −4

Conversation

Enzime
Copy link
Member

@Enzime Enzime commented Aug 2, 2018

Motivation for this change

OpenAL is broken on macOS and not currently worth using. On Linux, either ALSA/JACK/Pulseaudio audio backends would be used and on macOS the CoreAudio backend will be used by default, so using OpenAL does not seem necessary.

Things done
  • Tested without using sandboxing on macOS
  • 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.

Sorry, something went wrong.

matthewbauer
matthewbauer reviewed Aug 2, 2018
View reviewed changes
pkgs/applications/video/mpv/default.nix Outdated
# FIXME: Remove this patch for building on macOS if it gets released in
# the future.
patches = optional stdenv.isDarwin (fetchpatch {
url = https://patch-diff.githubusercontent.com/raw/mpv-player/mpv/pull/6040.patch;
Copy link
Member

Choose a reason for hiding this comment

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

IIRC this is not a good url to use. For instance if you rebase or add commits the sha256 will change. Instead , you should refer to the commit rev like:

https://github.com/mpv-player/mpv/commit/dc553c8cf4349b2ab5d2a373ad2fac8bdd229ebb.patch

@Enzime Enzime force-pushed the fix/latest-mpv-on-macos branch from 8aef969 to 69ed31a Compare August 2, 2018 23:21
@Mic92
Copy link
Member

Mic92 commented Aug 3, 2018

@GrahamcOfBorg build mpv

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: mpv

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0
shrinking /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0/bin/.mpv-wrapped
shrinking /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0/lib/libmpv.so.1.101.0
gzipping man pages under /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0/share/man/
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0/lib  /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0/bin
patching script interpreter paths in /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0
checking for references to /build in /nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0...
/nix/store/0d4znb2f8ff63l9a0kabqh9548qfackm-mpv-0.29.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: mpv

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0
shrinking /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0/lib/libmpv.so.1.101.0
shrinking /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0/bin/.mpv-wrapped
gzipping man pages under /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0/share/man/
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0/lib  /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0/bin
patching script interpreter paths in /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0
checking for references to /build in /nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0...
/nix/store/ji78g2vabwbcnig33kl33mdh7rzmihcz-mpv-0.29.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: mpv

Partial log (click to expand)

/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib
/nix/store/n885nak4r9i28f3n7hk1wdm4iyi4zmk2-mpv-0.29.0/lib/libmpv.1.101.0.dylib: fixing dylib

@Mic92 Mic92 merged commit 2be0d9c into NixOS:master Aug 3, 2018
@Enzime Enzime deleted the fix/latest-mpv-on-macos branch August 4, 2018 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Enzime @Mic92 @GrahamcOfBorg @matthewbauer