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: use waf from distribution and wafHook helper #79108

Merged
merged 1 commit into from Feb 3, 2020
Merged

mpv: use waf from distribution and wafHook helper #79108

merged 1 commit into from Feb 3, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Feb 2, 2020

This cleans up our dependency footprint by ensuring a consistent version, and
also avoids duplicating the logic for how to build a waf package by deferring to
the wafHook helper for the configurePhase, buildPhase, and installPhase.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@bhipple
mpv: use waf from distribution and wafHook helper
542d758 
This cleans up our dependency footprint by ensuring a consistent version, and
also avoids duplicating the logic for how to build a waf package by deferring to
the `wafHook` helper for the `configurePhase`, `buildPhase`, and `installPhase`.
@bhipple
Copy link
Contributor Author

bhipple commented Feb 2, 2020

@GrahamcOfBorg build mpv

@bhipple
Copy link
Contributor Author

bhipple commented Feb 2, 2020

It's building just fine as far as I can tell, and I see the correct configure flags being passed into mpv:

λ brh nixpkgs →  $(nix-build -A mpv)/bin/mpv --help
...
configuring
copying waf to ./waf...
configure flags: --prefix=/nix/store/8smczmb9g47mlpa44dll9ib14k2dym58-mpv-0.32.0 --enable-libmpv-shared --enable-manpage-build --disable-libmpv-static --disable-static-build --disable-build-date --disable-macos-cocoa-cb --disable-libarchive --disable-cdda --enable-dvdnav --enable-openal --enable-libsmbclient --enable-sdl2 --enable-sndio --enable-vaapi --enable-wayland --enable-dvbin configure
Setting top to                           : /build/source
...

Usage:   mpv [options] [url|path/]filename

Basic options:
 --start=<time>    seek to given (percent, seconds, or hh:mm:ss) position
 --no-audio        do not play sound
 --no-video        do not play video
 --fs              fullscreen playback
 --sub-file=<file> specify subtitle file to use
 --playlist=<file> specify playlist file

 --list-options    list all mpv options
 --h=<string>      print options which contain the given string in their name

@Ma27 Ma27 merged commit 2be2f86 into NixOS:master Feb 3, 2020
@bhipple bhipple deleted the fix/mpv-waf branch June 2, 2020 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@fpletz fpletz Awaiting requested review from fpletz

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@globin globin Awaiting requested review from globin

@tadeokondrak tadeokondrak Awaiting requested review from tadeokondrak

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@bhipple @Ma27