mpv: fix lua library paths and clean up #35885
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@GrahamcOfBorg build mpv |
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
Mic92
reviewed
Feb 27, 2018
| , xineramaSupport ? true, libXinerama ? null | ||
| , xvSupport ? true, libXv ? null | ||
| , sdl2Support ? true, SDL2 ? null | ||
| , alsaSupport ? !stdenv.isDarwin, alsaLib ? null |
There was a problem hiding this comment.
I moved these to the package call (in all-packages.nix) since there was a waylandSupport = stdenv.isLinux; there already.
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Mhm which package introduce |
|
|
I think we need a |
Mic92
reviewed
Feb 27, 2018
| rubberbandSupport = !stdenv.isDarwin; | ||
| dvdreadSupport = !stdenv.isDarwin; | ||
| dvdnavSupport = !stdenv.isDarwin; | ||
| drmSupport = !stdenv.isDarwin; |
There was a problem hiding this comment.
Oh, right. So does this mean the ? true in the package is overriding the option in the call?
There was a problem hiding this comment.
Only if the variable is null, which is not the case.
Does why-depends only show the first match?
$ nix-repl> ({ a ? true }: a) { a = false; }
falseThere was a problem hiding this comment.
$ nix why-depends -a nixpkgs.mpv nixpkgs.xlibs.libpciaccessgives a more complete picture
Mic92
reviewed
Feb 27, 2018
| @@ -1,7 +1,7 @@ | |||
| { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper | |||
| , docutils, perl, pkgconfig, python3, which, ffmpeg | |||
| , freefont_ttf, freetype, libass, libpthreadstubs | |||
| , lua, lua5_sockets, libuchardet, libiconv ? null, darwin | |||
| , lua, luasocket, libuchardet, libiconv ? null, darwin | |||
|
|
|||
| , x11Support ? true, | |||
There was a problem hiding this comment.
libpciaccess is pulled by mesa, which is pulled by x11Support.
|
@GrahamcOfBorg build mpv |
|
Let's roll the dice. |
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
@GrahamcOfBorg build mpv |
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
GrahamcOfBorg
added
8.has: clean-up
10.rebuild-darwin: 0
and removed
10.rebuild-darwin: 1-10
labels
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Thank you |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I fixed the library paths so luasocket can be used from mpv scripts and removed the libcaca TODO as it seems to work fine. Also I cleaned up a bit the features/options of the package.
Things done