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: 6168c2e45f7d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b4cf3f790924
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 22, 2018

  1. qt5: install pkg_config files on darwin 

    Fixes #31685

This patch is applied in Homebrew here and looks to have worked for
them:

https://github.com/Homebrew/homebrew-core/blob/fafbdbd237ee87fb49b1080821e2597b38ff521c/Formula/qt.rb#L33-L44

I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).

Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.

This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.
    @matthewbauer
    matthewbauer committed Feb 22, 2018
    Copy the full SHA
    a98a767 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig 

    qt5: install pkg_config files on darwin
    @LnL7
    LnL7 committed Feb 26, 2018
    Copy the full SHA
    b4cf3f7 View commit details
    Browse the repository at this point in the history