There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
* neovim-unwrapped: now use lua environments
* mpv: use lua environments
* luaPackages.inspect: init at 3.1.1-0
* luaPackages.lgi: mark as a lua module
* luaPackages.vicious: mark as a lua module
Introduced `cddaSupport` for `mpv` which defaults to false. By enabling
it, `mpv` will be compiled with cdda support (`libcdio{,-paranoia}`) to
play audio CDs.
Only enable X11 Support on Linux by default. Add CoreFoundation first in
the list of buildInputs to ensure that it is loaded before CF-osx
allowing it to provide <CoreFoundation/CFAttributedString.h>.
This is a follow-up to 6b404b944a, which
fixed the build after SDL no longer leaks through X libraries.
However the commit didn't actually pass all the required dependencies to
mpv, because the configure phase of mpv still disabled X support:
Checking for X11
err: Package xrandr was not found in the pkg-config search path.
Perhaps you should add the directory containing `xrandr.pc'
to the PKG_CONFIG_PATH environment variable
No package 'xrandr' found
So by adding libXrandr, we finally have support for X again.
Trivia: While I'm usually very pesky about line lengths this is one of
the very rare occasions where I didn't break the lines after 79
characters because it would have messed up the overall style of the
file.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @AndersonTorres, @fuuzetsu, @fpletz, @orivej
