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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8768d1c83afe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e49729f9b1df
Choose a head ref
  • 5 commits
  • 9 files changed
  • 1 contributor

Commits on Jun 23, 2019

  1. qttools: patch qmlimportscanner for darwin builds 

    This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.

Fixes #63093
    @matthewbauer
    matthewbauer committed Jun 23, 2019
    Copy the full SHA
    79c0e74 View commit details

  2. apple-sdk: add MetalKit

    @matthewbauer
    matthewbauer committed Jun 23, 2019
    Copy the full SHA
    4e22fe4 View commit details

  3. qt5.12: patch to work on x86_64-darwin 

    unfortunately, some private headers making the logging hard to handle.
Specifically, os/activity.h that is included does not match what Qt5
is expected. This removes the activity logging (while keeping the
other logging methods) on macOS.

Fixes #63528
    @matthewbauer
    matthewbauer committed Jun 23, 2019
    Copy the full SHA
    4c3e09b View commit details

  4. qt5: make qt512 the default on darwin

    @matthewbauer
    matthewbauer committed Jun 23, 2019
    Copy the full SHA
    758712c View commit details

Commits on Jun 24, 2019

  1. Merge pull request #63707 from matthewbauer/fix-63043 

    Qt5 + Darwin fixes
    @matthewbauer
    matthewbauer authored Jun 24, 2019
    Copy the full SHA
    e49729f View commit details
Loading