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

Commits on Jul 5, 2020

  1. Revert "cmake: only set output paths with multiple outputs" 

    This reverts commit be1b225.

The commit broke Qt modules using CMake because they disable setOutputFlags.

There is no need to have these flags limited to multiple output derivations since it
should just work. If it does not, it is a bug that should be fixed as per
https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path
Likewise, having a variable to disable passing the flags is also unnecessary,
since CMake, unlike some configure scripts, ignores unknown flags. And if a person
does not like the values, they can just override them by passing the offending
flag with a different value to cmakeFlags.
    @jtojnar
    jtojnar committed Jul 5, 2020
    Copy the full SHA
    cfe7e12 View commit details
    Browse the repository at this point in the history

  2. Revert "qt5.qtwebkit: Fix paths in pc files" 

    This reverts commit dee7377.
    @jtojnar
    jtojnar committed Jul 5, 2020
    Copy the full SHA
    f38d3df View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging-next' into staging

    @jtojnar
    jtojnar committed Jul 5, 2020
    Copy the full SHA
    b01f391 View commit details
    Browse the repository at this point in the history