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: de8ed9edbf13
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b74dc6f0f021
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 24, 2018

  1. qtwebengine: Use system ffmpeg on aarch64 

    On aarch64, linking against the vendored ffmpeg fails. Including ffmpeg
as a dependency and passing -system-ffmpeg to qmake fixes this.

Slightly odd conditional in qmakeFlags to avoid altering the list on
non-arm platforms, so that the change doesn't trigger an unneccessary
rebuild.
    @Thra11
    Thra11 authored and Thomas.Hall committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    e01c613 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2018

  1. Merge pull request #45122 from Thra11/qtwebengine-aarch64 

    qtwebengine: Use system ffmpeg on aarch64
    Thomas Tuegel committed Aug 25, 2018
    Configuration menu
    Copy the full SHA
    b74dc6f View commit details
    Browse the repository at this point in the history