Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4dfea241bc2d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7a19228215ed
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 4, 2018

  1. mpv: Fix X11 support by adding libXrandr

    This is a follow-up to 6b404b9, 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
    aszlig committed Jul 4, 2018
    1 Configuration menu
    Copy the full SHA
    7a19228 View commit details
    Browse the repository at this point in the history