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: 3fc3096da84d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9f889a4da31b
Choose a head ref
  • 4 commits
  • 9 files changed
  • 1 contributor

Commits on Mar 26, 2019

  1. qt5.qtwebengine: disable platform check using patches 

    The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

The patch for 5.12 is only tested to apply.
    @veprbl
    veprbl committed Mar 26, 2019
    Copy the full SHA
    1809832 View commit details
    Browse the repository at this point in the history

  2. qt5.qtwebengine: refactor more things to use patches instead of subst… 

    …ituteInPlace

qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
    @veprbl
    veprbl committed Mar 26, 2019
    Copy the full SHA
    ccd1bf6 View commit details
    Browse the repository at this point in the history

  3. qt59.qtwebengine: fix on darwin 

    This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.
    @veprbl
    veprbl committed Mar 26, 2019
    Copy the full SHA
    0624deb View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. Merge pull request #56440 from veprbl/pr/qt5_qtwebengine_darwin_fix2 

    qt5.qtwebengine: fix on darwin (again)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    9f889a4 View commit details
    Browse the repository at this point in the history