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: b7ad8d667c8d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 03308d129854
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 8, 2018

  1. qt510: disable framework build on macOS 

    We prefer to have $out/include & $out/lib installed so that things
like multiple outputs can work. There is no way to do this in Qt
currently without also disabling the ‘framework’ install. Not sure if
this will break anything but it will fix issues we run into on some
projects like python2.7-pyside:

Linux: https://hydra.nixos.org/build/73219181
macOS: https://hydra.nixos.org/build/73059550

Hopefully this gives us consistency between the two.
    @matthewbauer
    matthewbauer committed May 8, 2018
    Configuration menu
    Copy the full SHA
    c4cac55 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #40187 from matthewbauer/disable-framework-for-qt 

    Disable installing frameworks for qt
    @matthewbauer
    matthewbauer committed May 8, 2018
    Configuration menu
    Copy the full SHA
    03308d1 View commit details
    Browse the repository at this point in the history